From a318392985e53613117df38e82cf6711e1eb15f3 Mon Sep 17 00:00:00 2001
From: Kyle Bloom <kyle@symless.com>
Date: Fri, 19 Mar 2021 09:04:42 +0000
Subject: [PATCH] Synergy 801 wrong folder (#6966)

* Remove git fetch

* Testing changes

* Upload artifact

* Move python build version

* Fix artifact

* Move test

* Add extra logging

* Test version

* Reset workflow
---
 .github/workflows/job-build-mac-10.13.yaml | 12 ++++++------
 ChangeLog                                  |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/job-build-mac-10.13.yaml b/.github/workflows/job-build-mac-10.13.yaml
index 05871124af..bb87eb214d 100644
--- a/.github/workflows/job-build-mac-10.13.yaml
+++ b/.github/workflows/job-build-mac-10.13.yaml
@@ -23,7 +23,6 @@ jobs:
 
       - name: Setup Environment
         run: |
-          git fetch
           python3 -m pip install dmgbuild
       
       - name: Build SYNERGY
@@ -31,6 +30,7 @@ jobs:
           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 \
@@ -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)
@@ -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"
@@ -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 }}
@@ -104,7 +104,7 @@ jobs:
         run: |
           cd pkg
           ../CI/MacOS/notorize.sh
-        
+
       - name: Send package to Sandor
         env:
           HOST: ${{ secrets.SANDOR_HOST }}
diff --git a/ChangeLog b/ChangeLog
index 6edff05974..10b3103f5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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