diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index 69cad1d92..9cc4ae527 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -69,7 +69,7 @@ steps: SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH" SYNERGY_REVISION=`git rev-parse --short=8 HEAD` SYNERGY_DMG_VERSION="${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}_b$(Build.BuildNumber)-${SYNERGY_REVISION}" - SYNERGY_DMG_FILENAME=$(prefix)_v${SYNERGY_DMG_VERSION}_macos_$(name).dmg + SYNERGY_DMG_FILENAME=$(prefix)_v${SYNERGY_DMG_VERSION}_macos_$(platform).dmg echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}" echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_REVISION]${SYNERGY_REVISION}" diff --git a/ChangeLog b/ChangeLog index ec22d81f9..e314c3214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Enhancements: - #6841 Windows installer has been updated. - #6844 macOS installer has been updated. - #6??? About Synergy logo refreshed +- #6867 Create only 1 artefact for macOS v1.12.x-snapshot =========== diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 695e313e4..24b5d394a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,27 +66,15 @@ jobs: - job: MacOS strategy: matrix: - mojave-std: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "standard" - prefix: "synergy" - mojave-ent: - image: macOS-10.14 - name: mojave - version: 10.12 - buildType: "enterprise" - prefix: "synergy-enterprise" catalina-std: image: macOS-10.15 - name: catalina + platform: x86-64 version: 10.14 buildType: "standard" prefix: "synergy" catalina-ent: image: macOS-10.15 - name: catalina + platform: x86-64 version: 10.14 buildType: "enterprise" prefix: "synergy-enterprise"