diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index ba2d871cb..a11f11654 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -15,7 +15,7 @@ steps: inputs: script: | python3 -m pip install dmgbuild - python3 -m pip install aqtinstall + python3 -m pip install aqtinstall==0.11.1 displayName: 'Installing utilities' - task: CmdLine@2 @@ -50,7 +50,7 @@ steps: mkdir build cd build cmake \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$(version) \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CONFIGURATION_TYPES=Release \ @@ -65,6 +65,7 @@ steps: - task: CmdLine@2 inputs: script: | + export PATH="$(Qt5_DIR)/bin:$PATH" cd build . ./version make -j @@ -76,7 +77,7 @@ steps: - task: CmdLine@2 inputs: script: | - export PATH="$(QT_PATH):$PATH" + export PATH="$(QT_PATH):$(Qt5_DIR)/bin:$PATH" macdeployqt $(Build.Repository.LocalPath)/build/bundle/Synergy.app -codesign="$CODESIGN_ID" codesign -f --options runtime --deep -s "$CODESIGN_ID" $(Build.Repository.LocalPath)/build/bundle/Synergy.app ln -s /Applications $(Build.Repository.LocalPath)/build/bundle/Applications diff --git a/ChangeLog b/ChangeLog index 2b8a64bac..8feaa5647 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Bug fixes: - #6922 macOS CI build - #6927 Text copied and pasted between Windows and Mac OS converts to japanese - #6936 Application loses settings +- #6939 Update pipelines to use correct credentials Enhancements: - #6912 Removes UI for Screen Saver Sync and Files Drag and Drop