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

Adding MacOS CI Build Steps for Homebrew Cleanup

.github/workflows/job-changelog-check.yml

@@ -5,7 +5,7 @@
 # file with configuration.  For more information, see:
 # https://github.com/actions/labeler/blob/master/README.md
 
-name: Changlog Updated
+name: ChangeLog Updated
 on: 
   pull_request:
     branches: [ master ]
@@ -32,8 +32,8 @@ jobs:
     - name: List files
       run: |
         if [[ "${{ steps.file_changes.outputs.files_modified}}" == *"ChangeLog"* ]]; then
-          echo "Changlog has been updated"
+          echo "ChangeLog has been updated"
         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
         fi

CI/MacOS/installator_settings.py

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

CI/MacOS/mac-build.yml

@@ -8,7 +8,9 @@ steps:
 
   - task: CmdLine@2
     inputs:
-      script: 'brew install qt'
+      script: |
+        export HOMEBREW_NO_INSTALL_CLEANUP=1
+        brew install qt
     displayName: 'Installing QT'
 
   - task: CmdLine@2
@@ -84,7 +86,7 @@ steps:
         dmgbuild \
           -s CI/MacOS/installator_settings.py \
           -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_DMG_FILENAME)
         mkdir pkg
@@ -114,4 +116,4 @@ steps:
       targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/$(SYNERGY_REVISION)/'
       readyTimeout: '20000'
     displayName: 'Send Package to sandor'
-    condition: eq(variables['Build.Reason'], 'Manual')
+    condition: eq(variables['Build.Reason'], 'Manual')

ChangeLog

@@ -1,4 +1,4 @@
-v1.13.x
+v1.13.x    
 ===========
 Bug fixes:
 - #6858 Application is blurry and unfocused on macOS

cmake/Version.cmake

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