From 6b32b87c0a55941bbaa2a97394a819222ecc7dc4 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Mon, 16 Nov 2026 17:38:34 -0600 Subject: [PATCH 1/2] chore(ci): group workflow names by area, let a bake be cancelled Area prefixes (App, Bins, Content, Dash, Deps, Play, RootFS) and step numbers sort the Actions list. The bake job used always(), so "Cancel workflow" never stopped it; !cancelled() keeps the skip case. --- .github/workflows/android-r2-republish.yml | 2 +- .github/workflows/android-release-build.yml | 2 +- .github/workflows/android-sanity-check.yml | 2 +- .github/workflows/bake-rootfs.yml | 9 +++++---- .github/workflows/binaries-lifecycle.yml | 2 +- .github/workflows/binary-bump-consistency.yml | 2 +- .github/workflows/build-static-binaries.yml | 2 +- .github/workflows/dashboard-check.yml | 2 +- .github/workflows/firebase-distribution.yml | 2 +- .github/workflows/play-candidate.yml | 2 +- .github/workflows/play-release.yml | 2 +- .github/workflows/prebuild-tests.yml | 2 +- .github/workflows/promote-rootfs.yml | 2 +- .github/workflows/publish-catalogs.yml | 2 +- .github/workflows/upstream-mirror.yml | 2 +- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/android-r2-republish.yml b/.github/workflows/android-r2-republish.yml index 213ebcfb1..04371980e 100644 --- a/.github/workflows/android-r2-republish.yml +++ b/.github/workflows/android-r2-republish.yml @@ -1,4 +1,4 @@ -name: Republish APK + AAB to R2 (interim manual) +name: App: republish to R2 # INTERIM / TEMPORARY tool (K2GO-457). It pushes the website APK (standard flavor) and the Play AAB # (play flavor) to Cloudflare R2 BETWEEN tagged releases. Files are named after versionName, so a diff --git a/.github/workflows/android-release-build.yml b/.github/workflows/android-release-build.yml index dd044107f..c9927ae8b 100644 --- a/.github/workflows/android-release-build.yml +++ b/.github/workflows/android-release-build.yml @@ -1,4 +1,4 @@ -name: Build and Release K2Go APKs +name: App: build release APKs on: # K2GO-564: only play-release.yml starts a release, after Google approved the candidate, so GitHub diff --git a/.github/workflows/android-sanity-check.yml b/.github/workflows/android-sanity-check.yml index df7e8b4c4..11b0ef891 100644 --- a/.github/workflows/android-sanity-check.yml +++ b/.github/workflows/android-sanity-check.yml @@ -1,4 +1,4 @@ -name: Android Sanity Check (CI) +name: App: CI checks on: # One run per PR (pull_request) and one post-merge on the integration branches. diff --git a/.github/workflows/bake-rootfs.yml b/.github/workflows/bake-rootfs.yml index ccbdf39e0..c77a057ee 100644 --- a/.github/workflows/bake-rootfs.yml +++ b/.github/workflows/bake-rootfs.yml @@ -1,4 +1,4 @@ -name: Bake & publish K2Go RootFS +name: RootFS: 2. bake + publish # ADFA-5334. Builds the rootfs images with tools/rootfs-builder/build-iiab-rootfs.sh # (native proot on arm64 runners) and publishes them to Cloudflare R2 (k2go-rootfs). @@ -179,9 +179,10 @@ jobs: bake: needs: [prebuild-tests, seed-base, plan] # K2GO-567: tests gate the bake; base present before publish - # always() so a SKIPPED prebuild-tests (run_prebuild_tests=false) does not auto-skip the bake; the - # bake still runs only if prebuild-tests did not FAIL/cancel and the base + plan succeeded. - if: ${{ always() && needs.prebuild-tests.result != 'failure' && needs.prebuild-tests.result != 'cancelled' && needs.seed-base.result == 'success' && needs.plan.result == 'success' }} + # !cancelled() so a SKIPPED prebuild-tests (run_prebuild_tests=false) does not auto-skip the bake; the + # bake still runs only if prebuild-tests did not FAIL/cancel and the base + plan succeeded. Not + # always(): a running job whose if: is still true ignores "Cancel workflow". + if: ${{ !cancelled() && needs.prebuild-tests.result != 'failure' && needs.prebuild-tests.result != 'cancelled' && needs.seed-base.result == 'success' && needs.plan.result == 'success' }} name: RootFS ${{ matrix.arch }} ${{ matrix.tier }} # Native arm64 runner (the builder uses native proot, not QEMU). Adjust the label # if the org uses a different arm64 runner (e.g. a self-hosted one). diff --git a/.github/workflows/binaries-lifecycle.yml b/.github/workflows/binaries-lifecycle.yml index ad121a560..e5722f8b4 100644 --- a/.github/workflows/binaries-lifecycle.yml +++ b/.github/workflows/binaries-lifecycle.yml @@ -1,4 +1,4 @@ -name: Binaries lifecycle (archive + retention) +name: Bins: archive + retention # K2GO-506: archive every native-binaries release to R2 (never pruned), then prune old GitHub # releases without deleting a pinned or unarchived build. build-static-binaries.yml calls it after diff --git a/.github/workflows/binary-bump-consistency.yml b/.github/workflows/binary-bump-consistency.yml index b5f96edf0..4f5f1c754 100644 --- a/.github/workflows/binary-bump-consistency.yml +++ b/.github/workflows/binary-bump-consistency.yml @@ -1,4 +1,4 @@ -name: Binary bump consistency +name: Bins: bump check # Guards the native-binaries pin: if the release tag changes, the integrity # manifest must change in the same PR (see controller/docs/UPDATING_NATIVE_BINARIES.md). diff --git a/.github/workflows/build-static-binaries.yml b/.github/workflows/build-static-binaries.yml index e464421a0..cd0ce2401 100644 --- a/.github/workflows/build-static-binaries.yml +++ b/.github/workflows/build-static-binaries.yml @@ -1,4 +1,4 @@ -name: Build static binaries (PRoot) +name: Bins: build static (PRoot) on: workflow_dispatch: diff --git a/.github/workflows/dashboard-check.yml b/.github/workflows/dashboard-check.yml index 25a26770c..249238632 100644 --- a/.github/workflows/dashboard-check.yml +++ b/.github/workflows/dashboard-check.yml @@ -1,4 +1,4 @@ -name: Dashboard Check (typecheck + tests) +name: Dash: typecheck + tests # The device dashboard (static/dashboard) is Node + TypeScript and boots via ts-node, # which type-checks on start — so a TS error can stop it booting. Nothing else in CI diff --git a/.github/workflows/firebase-distribution.yml b/.github/workflows/firebase-distribution.yml index 630c47a83..07fe6cd0d 100644 --- a/.github/workflows/firebase-distribution.yml +++ b/.github/workflows/firebase-distribution.yml @@ -1,4 +1,4 @@ -name: Deploy to Firebase App Distribution +name: App: Firebase distribution # ADFA-4810: build & distribute on a push to ANY branch (not just main), so anyone gets a # Firebase build of their work without waiting for a merge. Tags (v*) are handled by diff --git a/.github/workflows/play-candidate.yml b/.github/workflows/play-candidate.yml index 1927c1e3d..3040cd6a7 100644 --- a/.github/workflows/play-candidate.yml +++ b/.github/workflows/play-candidate.yml @@ -1,4 +1,4 @@ -name: Play candidate (send a release candidate to Google review) +name: Play: 1. send candidate # K2GO-564, button 1 of the release flow. Design: controller/docs/ADR-K2GO-564-play-release-candidates.md # Builds the Play AAB from the selected branch, takes the next versionCode from Play, sends the build diff --git a/.github/workflows/play-release.yml b/.github/workflows/play-release.yml index c49f1afd9..499b5a3af 100644 --- a/.github/workflows/play-release.yml +++ b/.github/workflows/play-release.yml @@ -1,4 +1,4 @@ -name: Play release (publish an approved candidate) +name: Play: 2. publish release # K2GO-564, button 2 of the release flow. Design: controller/docs/ADR-K2GO-564-play-release-candidates.md # Run this after Google approved a candidate. It tags the candidate commit with the final version diff --git a/.github/workflows/prebuild-tests.yml b/.github/workflows/prebuild-tests.yml index 948582513..8d93c475d 100644 --- a/.github/workflows/prebuild-tests.yml +++ b/.github/workflows/prebuild-tests.yml @@ -1,4 +1,4 @@ -name: Pre-build tests (gate the rootfs bake) +name: RootFS: 1. pre-build tests # K2GO-567. Fast, NATIVE tests that must pass BEFORE the rootfs bake (bake-rootfs.yml). No proot, # no root. Runs the dash-node unit tests plus the contract tests, which check the REAL upstream diff --git a/.github/workflows/promote-rootfs.yml b/.github/workflows/promote-rootfs.yml index f9cff2b08..004d5cc0d 100644 --- a/.github/workflows/promote-rootfs.yml +++ b/.github/workflows/promote-rootfs.yml @@ -1,4 +1,4 @@ -name: Promote K2Go RootFS +name: RootFS: 3. promote # K2GO-511. Moves the production pointers (latest_*) to a tested build: by default the dev # channel (dev_latest_*), the exact build that was installed and tested on devices. A server-side diff --git a/.github/workflows/publish-catalogs.yml b/.github/workflows/publish-catalogs.yml index 1d36856f5..d32388a6b 100644 --- a/.github/workflows/publish-catalogs.yml +++ b/.github/workflows/publish-catalogs.yml @@ -1,4 +1,4 @@ -name: Publish content catalogs +name: Content: publish catalogs # ADFA-5094 (ADR-5094): generate the Kolibri/Kiwix catalogs once a week off the build and # publish them + a versioned manifest to Cloudflare R2, so the app can refresh the catalog diff --git a/.github/workflows/upstream-mirror.yml b/.github/workflows/upstream-mirror.yml index 75442ae95..c3f0491cf 100644 --- a/.github/workflows/upstream-mirror.yml +++ b/.github/workflows/upstream-mirror.yml @@ -1,7 +1,7 @@ # Keep a known-good copy of upstream build deps on the K2Go R2 bucket, so the bake can fall # back to it when the upstream host is down (K2GO-563). R2 layout: upstream///. -name: Mirror upstream deps to R2 +name: Deps: mirror upstream to R2 on: workflow_dispatch: From 26e118bdbe587d8a1c73c3a7bd5a6e4db94ec03b Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Mon, 16 Nov 2026 17:38:47 -0600 Subject: [PATCH 2/2] chore(ci): quote workflow names that contain a colon --- .github/workflows/android-r2-republish.yml | 2 +- .github/workflows/android-release-build.yml | 2 +- .github/workflows/android-sanity-check.yml | 2 +- .github/workflows/bake-rootfs.yml | 2 +- .github/workflows/binaries-lifecycle.yml | 2 +- .github/workflows/binary-bump-consistency.yml | 2 +- .github/workflows/build-static-binaries.yml | 2 +- .github/workflows/dashboard-check.yml | 2 +- .github/workflows/firebase-distribution.yml | 2 +- .github/workflows/play-candidate.yml | 2 +- .github/workflows/play-release.yml | 2 +- .github/workflows/prebuild-tests.yml | 2 +- .github/workflows/promote-rootfs.yml | 2 +- .github/workflows/publish-catalogs.yml | 2 +- .github/workflows/upstream-mirror.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/android-r2-republish.yml b/.github/workflows/android-r2-republish.yml index 04371980e..9d76809f5 100644 --- a/.github/workflows/android-r2-republish.yml +++ b/.github/workflows/android-r2-republish.yml @@ -1,4 +1,4 @@ -name: App: republish to R2 +name: "App: republish to R2" # INTERIM / TEMPORARY tool (K2GO-457). It pushes the website APK (standard flavor) and the Play AAB # (play flavor) to Cloudflare R2 BETWEEN tagged releases. Files are named after versionName, so a diff --git a/.github/workflows/android-release-build.yml b/.github/workflows/android-release-build.yml index c9927ae8b..a07edb636 100644 --- a/.github/workflows/android-release-build.yml +++ b/.github/workflows/android-release-build.yml @@ -1,4 +1,4 @@ -name: App: build release APKs +name: "App: build release APKs" on: # K2GO-564: only play-release.yml starts a release, after Google approved the candidate, so GitHub diff --git a/.github/workflows/android-sanity-check.yml b/.github/workflows/android-sanity-check.yml index 11b0ef891..c1aef2a8c 100644 --- a/.github/workflows/android-sanity-check.yml +++ b/.github/workflows/android-sanity-check.yml @@ -1,4 +1,4 @@ -name: App: CI checks +name: "App: CI checks" on: # One run per PR (pull_request) and one post-merge on the integration branches. diff --git a/.github/workflows/bake-rootfs.yml b/.github/workflows/bake-rootfs.yml index c77a057ee..dd20fc151 100644 --- a/.github/workflows/bake-rootfs.yml +++ b/.github/workflows/bake-rootfs.yml @@ -1,4 +1,4 @@ -name: RootFS: 2. bake + publish +name: "RootFS: 2. bake + publish" # ADFA-5334. Builds the rootfs images with tools/rootfs-builder/build-iiab-rootfs.sh # (native proot on arm64 runners) and publishes them to Cloudflare R2 (k2go-rootfs). diff --git a/.github/workflows/binaries-lifecycle.yml b/.github/workflows/binaries-lifecycle.yml index e5722f8b4..1e466aa40 100644 --- a/.github/workflows/binaries-lifecycle.yml +++ b/.github/workflows/binaries-lifecycle.yml @@ -1,4 +1,4 @@ -name: Bins: archive + retention +name: "Bins: archive + retention" # K2GO-506: archive every native-binaries release to R2 (never pruned), then prune old GitHub # releases without deleting a pinned or unarchived build. build-static-binaries.yml calls it after diff --git a/.github/workflows/binary-bump-consistency.yml b/.github/workflows/binary-bump-consistency.yml index 4f5f1c754..5fd5f71d3 100644 --- a/.github/workflows/binary-bump-consistency.yml +++ b/.github/workflows/binary-bump-consistency.yml @@ -1,4 +1,4 @@ -name: Bins: bump check +name: "Bins: bump check" # Guards the native-binaries pin: if the release tag changes, the integrity # manifest must change in the same PR (see controller/docs/UPDATING_NATIVE_BINARIES.md). diff --git a/.github/workflows/build-static-binaries.yml b/.github/workflows/build-static-binaries.yml index cd0ce2401..747641210 100644 --- a/.github/workflows/build-static-binaries.yml +++ b/.github/workflows/build-static-binaries.yml @@ -1,4 +1,4 @@ -name: Bins: build static (PRoot) +name: "Bins: build static (PRoot)" on: workflow_dispatch: diff --git a/.github/workflows/dashboard-check.yml b/.github/workflows/dashboard-check.yml index 249238632..12ec95248 100644 --- a/.github/workflows/dashboard-check.yml +++ b/.github/workflows/dashboard-check.yml @@ -1,4 +1,4 @@ -name: Dash: typecheck + tests +name: "Dash: typecheck + tests" # The device dashboard (static/dashboard) is Node + TypeScript and boots via ts-node, # which type-checks on start — so a TS error can stop it booting. Nothing else in CI diff --git a/.github/workflows/firebase-distribution.yml b/.github/workflows/firebase-distribution.yml index 07fe6cd0d..2b6397d74 100644 --- a/.github/workflows/firebase-distribution.yml +++ b/.github/workflows/firebase-distribution.yml @@ -1,4 +1,4 @@ -name: App: Firebase distribution +name: "App: Firebase distribution" # ADFA-4810: build & distribute on a push to ANY branch (not just main), so anyone gets a # Firebase build of their work without waiting for a merge. Tags (v*) are handled by diff --git a/.github/workflows/play-candidate.yml b/.github/workflows/play-candidate.yml index 3040cd6a7..5cf12c7ba 100644 --- a/.github/workflows/play-candidate.yml +++ b/.github/workflows/play-candidate.yml @@ -1,4 +1,4 @@ -name: Play: 1. send candidate +name: "Play: 1. send candidate" # K2GO-564, button 1 of the release flow. Design: controller/docs/ADR-K2GO-564-play-release-candidates.md # Builds the Play AAB from the selected branch, takes the next versionCode from Play, sends the build diff --git a/.github/workflows/play-release.yml b/.github/workflows/play-release.yml index 499b5a3af..6981e57b2 100644 --- a/.github/workflows/play-release.yml +++ b/.github/workflows/play-release.yml @@ -1,4 +1,4 @@ -name: Play: 2. publish release +name: "Play: 2. publish release" # K2GO-564, button 2 of the release flow. Design: controller/docs/ADR-K2GO-564-play-release-candidates.md # Run this after Google approved a candidate. It tags the candidate commit with the final version diff --git a/.github/workflows/prebuild-tests.yml b/.github/workflows/prebuild-tests.yml index 8d93c475d..e7b323224 100644 --- a/.github/workflows/prebuild-tests.yml +++ b/.github/workflows/prebuild-tests.yml @@ -1,4 +1,4 @@ -name: RootFS: 1. pre-build tests +name: "RootFS: 1. pre-build tests" # K2GO-567. Fast, NATIVE tests that must pass BEFORE the rootfs bake (bake-rootfs.yml). No proot, # no root. Runs the dash-node unit tests plus the contract tests, which check the REAL upstream diff --git a/.github/workflows/promote-rootfs.yml b/.github/workflows/promote-rootfs.yml index 004d5cc0d..c9fb98fc0 100644 --- a/.github/workflows/promote-rootfs.yml +++ b/.github/workflows/promote-rootfs.yml @@ -1,4 +1,4 @@ -name: RootFS: 3. promote +name: "RootFS: 3. promote" # K2GO-511. Moves the production pointers (latest_*) to a tested build: by default the dev # channel (dev_latest_*), the exact build that was installed and tested on devices. A server-side diff --git a/.github/workflows/publish-catalogs.yml b/.github/workflows/publish-catalogs.yml index d32388a6b..3929085fb 100644 --- a/.github/workflows/publish-catalogs.yml +++ b/.github/workflows/publish-catalogs.yml @@ -1,4 +1,4 @@ -name: Content: publish catalogs +name: "Content: publish catalogs" # ADFA-5094 (ADR-5094): generate the Kolibri/Kiwix catalogs once a week off the build and # publish them + a versioned manifest to Cloudflare R2, so the app can refresh the catalog diff --git a/.github/workflows/upstream-mirror.yml b/.github/workflows/upstream-mirror.yml index c3f0491cf..b865a637a 100644 --- a/.github/workflows/upstream-mirror.yml +++ b/.github/workflows/upstream-mirror.yml @@ -1,7 +1,7 @@ # Keep a known-good copy of upstream build deps on the K2Go R2 bucket, so the bake can fall # back to it when the upstream host is down (K2GO-563). R2 layout: upstream///. -name: Deps: mirror upstream to R2 +name: "Deps: mirror upstream to R2" on: workflow_dispatch: