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
This commit is contained in:
Nick Bolton
2024-01-09 16:21:13 +00:00
committed by GitHub
parent 69e77dcb54
commit 55f68ed3e9
15 changed files with 39 additions and 37 deletions

View File

@ -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

View File

@ -1,4 +1,4 @@
name: Create Build
name: Create Release
on:
push:

View File

@ -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

View File

@ -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: |

View File

@ -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: |

View File

@ -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:

View File

@ -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

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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:

View File

@ -4,7 +4,7 @@ on:
- cron: "30 1 * * *"
jobs:
stale:
stale-issues:
runs-on: ubuntu-latest
steps:

View File

@ -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