From 55f68ed3e92892605caa02d7ee10c43de39b8d0e Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Tue, 9 Jan 2024 16:21:13 +0000
Subject: [PATCH] Switch to GitHub hosted Mac M1 runner (#7321)

* Switch to macos-latest-xlarge

* Improve job names

* Update create-release.yml

* Fixed workflow job names

* Further improve workflow naming

* Remove double checkout

* Rename Mac 11 workflow

* Remove redundant word

* Update ChangeLog

* Add matrix names for macOS

* Create test

* Delete test
---
 .github/workflows/codeql-analysis.yml               |  4 ++--
 .../{create-build.yml => create-release.yml}        |  2 +-
 .github/workflows/job-build-flatpak.yaml            |  4 ++--
 .github/workflows/job-build-mac-10.13.yaml          |  8 ++++----
 ...{job-build-mac-m1.yaml => job-build-mac-11.yaml} | 13 ++++---------
 .github/workflows/job-changelog-check.yml           |  6 ++++--
 .github/workflows/job-sonarcloud.yml                |  6 +++---
 .github/workflows/job-test-linux-centos.yml         |  4 ++--
 .github/workflows/job-test-linux-debian.yml         |  4 ++--
 .github/workflows/job-test-linux-fedora.yml         |  4 ++--
 .github/workflows/job-test-linux-ubuntu.yml         |  4 ++--
 .github/workflows/job-test-mac.yml                  | 10 +++++++---
 .github/workflows/job-test-windows.yml              |  4 ++--
 .github/workflows/stale-issues.yml                  |  2 +-
 ChangeLog                                           |  1 +
 15 files changed, 39 insertions(+), 37 deletions(-)
 rename .github/workflows/{create-build.yml => create-release.yml} (97%)
 rename .github/workflows/{job-build-mac-m1.yaml => job-build-mac-11.yaml} (96%)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0431078eb..5a9116636 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,4 +1,4 @@
-name: "CodeQL"
+name: "CodeQL Analysis"
 
 on:
   push:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  analyze:
+  codeql-analysis:
     name: Analyze
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-release.yml
similarity index 97%
rename from .github/workflows/create-build.yml
rename to .github/workflows/create-release.yml
index ab22b1c3f..dac162212 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-release.yml
@@ -1,4 +1,4 @@
-name: Create Build
+name: Create Release
 
 on:
   push:
diff --git a/.github/workflows/job-build-flatpak.yaml b/.github/workflows/job-build-flatpak.yaml
index fc478d961..0fc5c681a 100644
--- a/.github/workflows/job-build-flatpak.yaml
+++ b/.github/workflows/job-build-flatpak.yaml
@@ -1,11 +1,11 @@
-name: Ubuntu-flatpak
+name: "Build Linux Flatpak"
 
 on:
   release:
     types: [created]
 
 jobs:
-  build-flatpak-bundle:
+  build-linux-flatpak:
     name: ubuntu-flatpak
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/job-build-mac-10.13.yaml b/.github/workflows/job-build-mac-10.13.yaml
index d8fe5342a..c0b2d92be 100644
--- a/.github/workflows/job-build-mac-10.13.yaml
+++ b/.github/workflows/job-build-mac-10.13.yaml
@@ -1,12 +1,12 @@
-name: Mac
+name: "Build macOS 10.13"
 
 on:
   release:
     types: [created]
 
 jobs:
-  build-on-mac-10_13:
-    runs-on: [self-hosted, macOS, X64, "10.13"]
+  build-mac-10:
+    runs-on: "macos-latest-xlarge"
 
     strategy:
       matrix:
@@ -42,7 +42,7 @@ jobs:
         run: |
           python3 -m pip install dmgbuild
 
-      - name: Build SYNERGY
+      - name: Build
         env:
           CMAKE_PREFIX_PATH: "${{ env.Qt5_DIR }};${{ env.OpenSSL_DIR }}"
         run: |
diff --git a/.github/workflows/job-build-mac-m1.yaml b/.github/workflows/job-build-mac-11.yaml
similarity index 96%
rename from .github/workflows/job-build-mac-m1.yaml
rename to .github/workflows/job-build-mac-11.yaml
index ca0697d9d..65090582c 100644
--- a/.github/workflows/job-build-mac-m1.yaml
+++ b/.github/workflows/job-build-mac-11.yaml
@@ -1,4 +1,4 @@
-name: Mac
+name: "Build macOS 11"
 
 on:
   release:
@@ -9,8 +9,8 @@ defaults:
     shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"
 
 jobs:
-  build-on-mac-m1:
-    runs-on: [self-hosted, macOS, arm64]
+  build-mac-11:
+    runs-on: "macos-latest-xlarge"
 
     strategy:
       matrix:
@@ -45,17 +45,12 @@ jobs:
         with:
           submodules: "recursive"
 
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-
       - name: Setup Environment
         run: |
           python3 -m pip install dmgbuild
           brew bundle --file=- <<< "brew 'qt5'; brew 'openssl'"
 
-      - name: Build SYNERGY
+      - name: Build
         env:
           CMAKE_BUILD_TYPE: Release
         run: |
diff --git a/.github/workflows/job-changelog-check.yml b/.github/workflows/job-changelog-check.yml
index 9a0d2bbf6..4631bf146 100644
--- a/.github/workflows/job-changelog-check.yml
+++ b/.github/workflows/job-changelog-check.yml
@@ -5,13 +5,15 @@
 # file with configuration.  For more information, see:
 # https://github.com/actions/labeler/blob/master/README.md
 
-name: ChangeLog Updated
+name: "Check ChangeLog"
 on:
   pull_request:
     branches: [master]
 
 jobs:
-  check:
+  check-changelog:
+    if: ${{ !github.event.pull_request.draft }}
+
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/job-sonarcloud.yml b/.github/workflows/job-sonarcloud.yml
index 301fda3ef..b9a2f7472 100644
--- a/.github/workflows/job-sonarcloud.yml
+++ b/.github/workflows/job-sonarcloud.yml
@@ -1,4 +1,4 @@
-name: SonarCloud Static Analysis
+name: "SonarCloud Analysis"
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  sonarcloud-analysis:
     runs-on: ubuntu-latest
     container: symless/synergy-core:debian10
 
@@ -56,7 +56,7 @@ jobs:
           cd build-release
           make coverage
 
-      - name: Run Sonar
+      - name: Run Sonar Scanner
         run: |
           export PATH=$HOME/.sonar/sonar-scanner-${SONAR_SCANNER_VERSION}-linux/bin:$PATH
           cd build-release
diff --git a/.github/workflows/job-test-linux-centos.yml b/.github/workflows/job-test-linux-centos.yml
index 1ff0dfb70..123c33fad 100644
--- a/.github/workflows/job-test-linux-centos.yml
+++ b/.github/workflows/job-test-linux-centos.yml
@@ -1,4 +1,4 @@
-name: CentOS
+name: Test CentOS
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-arch64:
+  test-linux-centos:
     name: ${{ matrix.distro }}
     runs-on: ubuntu-latest
     container: symless/synergy-core:${{ matrix.distro }}
diff --git a/.github/workflows/job-test-linux-debian.yml b/.github/workflows/job-test-linux-debian.yml
index bf25b1d66..65bf3c52c 100644
--- a/.github/workflows/job-test-linux-debian.yml
+++ b/.github/workflows/job-test-linux-debian.yml
@@ -1,4 +1,4 @@
-name: Debian
+name: Test Debian
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-arch64:
+  test-linux-debian:
     name: ${{ matrix.distro }}
     runs-on: ubuntu-latest
     container: symless/synergy-core:${{ matrix.distro }}
diff --git a/.github/workflows/job-test-linux-fedora.yml b/.github/workflows/job-test-linux-fedora.yml
index 7c4970019..d9e08dc36 100644
--- a/.github/workflows/job-test-linux-fedora.yml
+++ b/.github/workflows/job-test-linux-fedora.yml
@@ -1,4 +1,4 @@
-name: Fedora
+name: Test Fedora
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-arch64:
+  test-linux-fedora:
     name: ${{ matrix.distro }}
     runs-on: ubuntu-latest
     container: symless/synergy-core:${{ matrix.distro }}
diff --git a/.github/workflows/job-test-linux-ubuntu.yml b/.github/workflows/job-test-linux-ubuntu.yml
index 562b55d7b..24a738728 100644
--- a/.github/workflows/job-test-linux-ubuntu.yml
+++ b/.github/workflows/job-test-linux-ubuntu.yml
@@ -1,4 +1,4 @@
-name: Ubuntu
+name: Test Ubuntu
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-arch64:
+  test-linux-ubuntu:
     name: ubuntu${{ matrix.distro }}
     runs-on: ubuntu-latest
     container: symless/synergy-core:ubuntu${{ matrix.distro }}
diff --git a/.github/workflows/job-test-mac.yml b/.github/workflows/job-test-mac.yml
index d77ac0dea..41f1b2ca9 100644
--- a/.github/workflows/job-test-mac.yml
+++ b/.github/workflows/job-test-mac.yml
@@ -1,4 +1,4 @@
-name: Mac
+name: "Test macOS"
 
 on:
   push:
@@ -21,15 +21,19 @@ jobs:
     strategy:
       matrix:
         runtime:
-          - os: "macos-latest"
+          - name: "macos-10-intel"
+            os: "macos-latest"
             arch: x64
             target: "10.14"
             shell: "bash"
-          - os: [self-hosted, macOS, arm64]
+          - name: "macos-11-m1"
+            os: "macos-latest-xlarge"
             arch: arm64
             target: "11"
             shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"
 
+    name: ${{ matrix.runtime.name }}
+
     env:
       GIT_COMMIT: ${{ github.sha }}
 
diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml
index 927784840..69dd59775 100644
--- a/.github/workflows/job-test-windows.yml
+++ b/.github/workflows/job-test-windows.yml
@@ -1,4 +1,4 @@
-name: Windows
+name: "Test Windows"
 
 on:
   push:
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-arch64:
+  test-windows:
     runs-on: windows-latest
 
     env:
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 1a5255b2b..d8b781cf6 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -4,7 +4,7 @@ on:
     - cron: "30 1 * * *"
 
 jobs:
-  stale:
+  stale-issues:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/ChangeLog b/ChangeLog
index c167228aa..dc26c9d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ CI changes:
 - #7318 Remove Azure Pipelines config entirely
 - #7319 Remove workflows for slow self-hosted RPi runners
 - #7320 Move build_version.py script to scripts dir
+- #7321 Switch to GitHub hosted Mac M1 runner
 
 # 1.14.6