mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-18 22:58:34 +01:00
fix(ci): run the macOS job on macos-latest right after lint, on every change to its paths, and drop the self-hosted one
macos-14 was retired on 2 November 2026 and the runner label was no longer supported, so macos-hosted was cancelled and failed required. Only Apple silicon and the latest macOS are supported, and a standard hosted runner is free on a public repository, so: - macos-hosted runs on macos-latest - it runs on a pull request that touches the macOS paths, without the label ci:macos - it needs only changes and lint, like windows-native-test, and no longer waits for the KDE VM suites - macos-selfhosted.yaml, its install-nix input, its path filter, the label ci:macos-self and the variable MACOS_SELF_HOSTED are removed
This commit is contained in:
1 parent
9c5f0c459f
commit
df2f3ae0ad
5 files changed
+21
-70
No files matched your search
@@ -1,5 +1,4 @@
|
||||
# The macOS jobs, called by ci.yaml on a hosted runner and by macos-selfhosted.yaml on the Mac Mini.
|
||||
# `runs-on` is JSON: '"macos-14"' or '["self-hosted","macOS","ARM64"]'.
|
||||
# The macOS jobs, called by ci.yaml on a hosted runner.
|
||||
|
||||
name: macos
|
||||
|
||||
@@ -7,13 +6,9 @@ on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
runs-on:
|
||||
description: The runner, as JSON
|
||||
description: The runner, as JSON, for example '"macos-latest"'
|
||||
type: string
|
||||
required: true
|
||||
install-nix:
|
||||
description: Install nix (a self-hosted machine already has it)
|
||||
type: boolean
|
||||
default: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
@@ -31,7 +26,6 @@ jobs:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/nix
|
||||
with:
|
||||
install: ${{ inputs.install-nix }}
|
||||
cachix-cache: ${{ vars.CACHIX_CACHE }}
|
||||
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
- name: The macOS checks
|
||||
|
||||
+10
-14
@@ -11,7 +11,7 @@ name: ci
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
# `labeled` so that adding ci:vm, ci:macos or ci:win-arm starts the stage the label asks for
|
||||
# `labeled` so that adding ci:vm or ci:win-arm starts the stage the label asks for
|
||||
types: [opened, synchronize, reopened, labeled]
|
||||
merge_group:
|
||||
push:
|
||||
@@ -306,6 +306,15 @@ jobs:
|
||||
# shellcheck disable=SC2046
|
||||
cargo nextest run --locked $(tools/test-partition packages windows) $(tools/test-partition packages os_sensitive)
|
||||
|
||||
# A hosted runner of Apple silicon with the latest macOS, the only one that is supported; free on a public repository.
|
||||
macos-hosted:
|
||||
needs: [changes, lint]
|
||||
if: ${{ !cancelled() && !failure() && needs.changes.outputs.macos == 'true' }}
|
||||
uses: ./.github/workflows/_macos.yaml
|
||||
with:
|
||||
runs-on: '"macos-latest"'
|
||||
secrets: inherit
|
||||
|
||||
# ---- stage 4: the KDE guests ----
|
||||
|
||||
# The suites are found in the flake, so that a new directory under nix/linux/tests/vm/suites is run
|
||||
@@ -345,19 +354,6 @@ jobs:
|
||||
suites: ${{ needs.discover.outputs.fast }}
|
||||
secrets: inherit
|
||||
|
||||
# ---- stage 5: macOS ----
|
||||
|
||||
macos-hosted:
|
||||
needs: [changes, vm-fast, mac-typecheck]
|
||||
if: >-
|
||||
${{ !cancelled() && !failure() && (
|
||||
(github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci:macos')) ||
|
||||
(github.event_name != 'pull_request' && needs.changes.outputs.macos == 'true')) }}
|
||||
uses: ./.github/workflows/_macos.yaml
|
||||
with:
|
||||
runs-on: '"macos-14"'
|
||||
secrets: inherit
|
||||
|
||||
# the only check that a ruleset requires: every job above passed or was skipped
|
||||
required:
|
||||
if: always()
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
# The macOS jobs on the Mac Mini of the owner. It is not part of the ladder and `required` does not
|
||||
# wait for it. Nothing runs until the repository variable MACOS_SELF_HOSTED is `true`, so the workflow
|
||||
# is inert while the machine is offline. A pull request starts it only with the label ci:macos-self,
|
||||
# and never when it comes from a fork: a self-hosted runner must not run the code of a stranger.
|
||||
|
||||
name: macos-selfhosted
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
# TEMPORARY: remove when komomono is merged to master
|
||||
- komomono
|
||||
pull_request:
|
||||
types: [labeled]
|
||||
|
||||
concurrency:
|
||||
group: macos-selfhosted
|
||||
cancel-in-progress: false
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
macos:
|
||||
if: >-
|
||||
${{ vars.MACOS_SELF_HOSTED == 'true' && (
|
||||
github.event_name != 'pull_request' || (
|
||||
github.event.label.name == 'ci:macos-self' &&
|
||||
github.event.pull_request.head.repo.full_name == github.repository)) }}
|
||||
uses: ./.github/workflows/_macos.yaml
|
||||
with:
|
||||
runs-on: '["self-hosted","macOS","ARM64"]'
|
||||
install-nix: false
|
||||
secrets: inherit
|
||||
Reference in new issue
Block a user