Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synergy 801 wrong folder #6966

Merged
merged 9 commits into from Mar 19, 2021
Merged

Synergy 801 wrong folder #6966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
adf5a46
Remove git fetch
aquacash5 Mar 18, 2021
5296b68
Testing changes
aquacash5 Mar 18, 2021
4aca70a
Upload artifact
aquacash5 Mar 18, 2021
6190673
Move python build version
aquacash5 Mar 18, 2021
f8cd5ce
Fix artifact
aquacash5 Mar 18, 2021
f8f9cd5
Move test
aquacash5 Mar 18, 2021
2231e78
Add extra logging
aquacash5 Mar 18, 2021
6adc8e8
Test version
aquacash5 Mar 18, 2021
31731ac
Reset workflow
aquacash5 Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/job-build-mac-10.13.yaml
View file
Open in desktop
Expand Up @@ -23,14 +23,14 @@ jobs:

- name: Setup Environment
run: |
git fetch
python3 -m pip install dmgbuild

- name: Build SYNERGY
env:
CMAKE_PREFIX_PATH: "${{ env.Qt5_DIR }};${{ env.OpenSSL_DIR }}"
run: |
export PATH="$Qt5_DIR/bin:$PATH"
python3 CI/build_version.py
mkdir build
cd build
cmake \
Expand All @@ -40,11 +40,10 @@ jobs:
-DCMAKE_CONFIGURATION_TYPES=Release ..
. ./version
make -j

- name: Version Info
id: version
run: |
python3 CI/build_version.py
. ./build/version
SYNERGY_VERSION="${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}"
SYNERGY_REVISION=$(git rev-parse --short=8 HEAD)
Expand All @@ -66,10 +65,11 @@ jobs:
SYNERGY_REMOTE_FOLDER="synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}"
fi
SYNERGY_DMG_FILENAME="${SYNERGY_PACKAGE_NAME}_${SYNERGY_DMG_VERSION}_macos-10.13_x86-64.dmg"
echo "SYNERGY_REMOTE_FOLDER: $SYNERGY_REMOTE_FOLDER"
echo "::set-output name=SYNERGY_REMOTE_FOLDER::$SYNERGY_REMOTE_FOLDER"
echo "::set-output name=SYNERGY_PACKAGE_NAME::$SYNERGY_PACKAGE_NAME"
echo "::set-output name=SYNERGY_DMG_FILENAME::$SYNERGY_DMG_FILENAME"

- name: Sign applicaiton
run: |
export PATH="$Qt5_DIR/bin:$PATH"
Expand All @@ -93,7 +93,7 @@ jobs:
md5 -r $SYNERGY_DMG_FILENAME >> $SYNERGY_DMG_FILENAME.checksum.txt
shasum $SYNERGY_DMG_FILENAME >> $SYNERGY_DMG_FILENAME.checksum.txt
shasum -a 256 $SYNERGY_DMG_FILENAME >> $SYNERGY_DMG_FILENAME.checksum.txt

- name: Submit for Notarization
env:
ASC_USERNAME: ${{ secrets.ASC_USERNAME }}
Expand All @@ -104,7 +104,7 @@ jobs:
run: |
cd pkg
../CI/MacOS/notorize.sh

- name: Send package to Sandor
env:
HOST: ${{ secrets.SANDOR_HOST }}
Expand Down
3 changes: 2 additions & 1 deletion ChangeLog
View file
Open in desktop
Expand Up @@ -2,10 +2,11 @@ v1.13.2-snapshot
===========
Bug fixes:
- #6953 | #6961 The system does not update server name in Server configuration
- #6966 macOS 10.13 missing build number

Enhancements:
- #6954 Move language selection to advanced section
- #6962 | #6965 Add macos10.13 builder
- #6962 | #6965 Add macOS 10.13 builder
===========

v1.13.1-stable
Expand Down