Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

ci(app): a newer push to main replaces the run before it

raymondchinse6904771f23a
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index a5a0dad..236ae44 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -14,12 +14,13 @@ on:
permissions:
contents: read
-# A newer push to the same PR replaces the run. Every push to main or beta (and every manual
-# run) has a group of its own, so none is cancelled, and none is dropped from the queue
-# the way a pending run is when a third arrives in a shared group.
+# A newer push to the same branch or PR replaces the run, so a feature commit and the
+# release bump pushed right after it don't hold the macOS runners twice. A release still
+# finds a passing run: build-local.sh accepts one on the bump commit (only version.h
+# differs). Every manual run has a group of its own and is never cancelled.
concurrency:
- group: app-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
- cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+ group: app-${{ github.event_name == 'workflow_dispatch' && github.run_id || github.ref }}
+ cancel-in-progress: true
env:
DOBBY_COMMIT: "5dfc8546954ce3b3198132ab13fddb89ee92cdd7"
diff --git a/scripts/tests/cicheck.sh b/scripts/tests/cicheck.sh
index b3fa005..f87a3fb 100644
--- a/scripts/tests/cicheck.sh
+++ b/scripts/tests/cicheck.sh
@@ -341,8 +341,8 @@ eq "lint.yml: push branches" " branches: [main, beta]" "$(grep -E '^ branc
yes "app.yml: runs on every pull request" grep -Fxq ' pull_request:' "$app"
no "app.yml: pull requests not limited to a branch" awk '/^ pull_request:/ { p = 1; next } p && /^ branches/ { f = 1 } p && /^ [a-z_]+:/ { p = 0 } END { exit !f }' "$app"
yes "lint.yml: runs on every pull request" grep -Fxq ' pull_request:' "$lint"
-yes "app.yml: only PR runs are cancelled" grep -Fxq ' cancel-in-progress: ${{ github.event_name == '"'pull_request'"' }}' "$app"
-yes "app.yml: other runs have a group of their own" grep -Fxq ' group: app-${{ github.event_name == '"'pull_request'"' && github.ref || github.run_id }}' "$app"
+yes "app.yml: a newer run replaces an older one" grep -Fxq ' cancel-in-progress: true' "$app"
+yes "app.yml: one group per branch or PR, manual runs alone" grep -Fxq ' group: app-${{ github.event_name == '"'workflow_dispatch'"' && github.run_id || github.ref }}' "$app"
build=$(job build)
checks=$(job checks)