diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index d0424ef..f62ec9f 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -192,10 +192,11 @@ jobs: dist/steamify-app.tar.gz assets/steam-gaming-settings.svg - # 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.) + # A new version starts the Steamify ISO's release of the ISO repo: its iso-1-github-tag.yml (always run from + # master) names the ISO after the newest Steamify release, tags it, and the Gitea mirror builds and attaches the ISO. + # The branch here decides the kind of build (the workflow's input `kind`): + # main (publishes the release) -> release: a real ISO (tag v-) + # release/** (a version not yet released) -> dev: a 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 @@ -210,6 +211,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 - 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)" + if [ "$GITHUB_REF" = refs/heads/main ]; then kind=release; else kind=dev; fi + gh workflow run iso-1-github-tag.yml -R theupriser/steamify-cachyos-live-iso --ref master -f kind="$kind" + echo "Started the Steamify ISO's release (theupriser/steamify-cachyos-live-iso, master, kind $kind)" diff --git a/CHANGELOG.md b/CHANGELOG.md index 710cf47..ea7bb7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +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** +- **fix(ci): a version published from main starts a real ISO release, a version on a release branch a dev ISO: the ISO workflow always runs from the ISO repo's master and gets the kind as an input (it always started the dev one from feat/steamify)** - **chore: Version 2.9.6** ## 2.9.5 - 2026-09-30