Merge pull request #6863 from symless/v1.13.0-rc2

Adding MacOS CI Build Steps for Homebrew Cleanup
This commit is contained in:
Ignacio Rodríguez 2020-12-15 19:53:06 +07:00 committed by GitHub
commit 54736d1271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 10 deletions

View file

@ -5,7 +5,7 @@
# file with configuration. For more information, see: # file with configuration. For more information, see:
# https://github.com/actions/labeler/blob/master/README.md # https://github.com/actions/labeler/blob/master/README.md
name: Changlog Updated name: ChangeLog Updated
on: on:
pull_request: pull_request:
branches: [ master ] branches: [ master ]
@ -32,8 +32,8 @@ jobs:
- name: List files - name: List files
run: | run: |
if [[ "${{ steps.file_changes.outputs.files_modified}}" == *"ChangeLog"* ]]; then if [[ "${{ steps.file_changes.outputs.files_modified}}" == *"ChangeLog"* ]]; then
echo "Changlog has been updated" echo "ChangeLog has been updated"
else else
echo "::error file=app.js,line=10,col=15::Changelog hasnt been updated" echo "::error file=app.js,line=10,col=15::Changelog hasn't been updated"
exit 1 exit 1
fi fi

View file

@ -49,7 +49,7 @@ badge_icon = icon_from_app(application)
icon_locations = { icon_locations = {
appname: (144, 190), appname: (144, 190),
'Applications': (455, 190), 'Applications': (455, 190),
'.background.png': (150, 450), '.background.tiff': (150, 450),
'.VolumeIcon.icns': (455, 450) '.VolumeIcon.icns': (455, 450)
} }

View file

@ -8,7 +8,9 @@ steps:
- task: CmdLine@2 - task: CmdLine@2
inputs: inputs:
script: 'brew install qt' script: |
export HOMEBREW_NO_INSTALL_CLEANUP=1
brew install qt
displayName: 'Installing QT' displayName: 'Installing QT'
- task: CmdLine@2 - task: CmdLine@2
@ -84,7 +86,7 @@ steps:
dmgbuild \ dmgbuild \
-s CI/MacOS/installator_settings.py \ -s CI/MacOS/installator_settings.py \
-D app=$(Build.Repository.LocalPath)/build/bundle/Synergy.app \ -D app=$(Build.Repository.LocalPath)/build/bundle/Synergy.app \
-D background=$(Build.Repository.LocalPath)/build/bundle/Synergy.app/Contents/Resources/installer_background.png \ -D background=$(Build.Repository.LocalPath)/build/bundle/Synergy.app/Contents/Resources/.installer_background.tiff \
"Synergy" \ "Synergy" \
$(SYNERGY_DMG_FILENAME) $(SYNERGY_DMG_FILENAME)
mkdir pkg mkdir pkg

View file

@ -5,9 +5,9 @@ cmake_minimum_required (VERSION 3.4)
# #
set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 12) set (SYNERGY_VERSION_MINOR 13)
set (SYNERGY_VERSION_PATCH 0) set (SYNERGY_VERSION_PATCH 0)
set (SYNERGY_VERSION_STAGE "snapshot") set (SYNERGY_VERSION_STAGE "rc2")
# #
# Version from CI # Version from CI

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB