From c42d5454bff587b3e732c083003065dbf2f09c23 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 11:31:37 +0200 Subject: [PATCH] fix(ci): a version published from main starts a real ISO release, a release branch a dev ISO --- .github/workflows/bundle.yml | 18 +++++++++++------- CHANGELOG.md | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index b0cc3ab..d0424ef 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -192,14 +192,17 @@ jobs: dist/steamify-app.tar.gz assets/steam-gaming-settings.svg - # A new Steamify release starts the Steamify ISO's release with it (a test build from the ISO repo's - # feat/steamify, until that is its master): its iso-1-github-tag.yml names it after this version, tags it, - # and the Gitea mirror builds and attaches the ISO. Needs a fine-grained token for that repo - # (Actions: read and write) as the secret ISO_DISPATCH_TOKEN; without it, this is skipped. + # A new version starts the Steamify ISO's release of the ISO repo: its iso-1-github-tag.yml names the ISO after + # the newest Steamify release, tags it, and the Gitea mirror builds and attaches the ISO. + # main (publishes the release) -> the ISO repo's master: a real ISO release (tag v-) + # release/** (a version not yet released) -> its feat/steamify: a dev pre-release (tag v-dev.) + # Needs a fine-grained token for that repo (Actions: read and write) as the secret ISO_DISPATCH_TOKEN; + # without it, this is skipped. - name: Start the Steamify ISO's release if: >- github.server_url == 'https://github.com' && - github.event_name != 'pull_request' && github.ref == 'refs/heads/main' && + github.event_name != 'pull_request' && + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && steps.version.outputs.released == 'false' env: GH_TOKEN: ${{ secrets.ISO_DISPATCH_TOKEN }} @@ -207,5 +210,6 @@ jobs: if [ -z "$GH_TOKEN" ]; then echo "::notice::No ISO_DISPATCH_TOKEN: the Steamify ISO isn't released with this version."; exit 0 fi - gh workflow run iso-1-github-tag.yml -R theupriser/steamify-cachyos-live-iso --ref feat/steamify - echo "Started the Steamify ISO's release (theupriser/steamify-cachyos-live-iso, feat/steamify)" + if [ "$GITHUB_REF" = refs/heads/main ]; then iso_ref=master; else iso_ref=feat/steamify; fi + gh workflow run iso-1-github-tag.yml -R theupriser/steamify-cachyos-live-iso --ref "$iso_ref" + echo "Started the Steamify ISO's release (theupriser/steamify-cachyos-live-iso, $iso_ref)" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0eff65e..710cf47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ one per merged pull request. ## 2.9.6 - 2026-09-30 +- **fix(ci): a version published from main starts a real ISO release (the ISO repo's master), a version on a release branch a dev ISO (its feat/steamify); it always started the dev one** - **chore: Version 2.9.6** ## 2.9.5 - 2026-09-30