From b8477432b56f864e68ce670485fbb13b100e90b4 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 12:45:14 +0200 Subject: [PATCH] fix(ci): a release branch builds its dev ISO with its own Steamify (steamify_ref), not the newest release --- .github/workflows/bundle.yml | 7 ++++--- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index f62ec9f..99a4132 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -211,6 +211,7 @@ 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 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)" + # A release branch builds the ISO with its own code (and VERSION): steamify_ref. main builds the release it just published. + if [ "$GITHUB_REF" = refs/heads/main ]; then kind=release; sref=""; else kind=dev; sref="$GITHUB_REF_NAME"; fi + gh workflow run iso-1-github-tag.yml -R theupriser/steamify-cachyos-live-iso --ref master -f kind="$kind" -f steamify_ref="$sref" + echo "Started the Steamify ISO's release (theupriser/steamify-cachyos-live-iso, master, kind $kind, Steamify ${sref:-the newest release})" diff --git a/CHANGELOG.md b/CHANGELOG.md index f1522a4..b878672 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 dev ISO from a release branch is built with that branch's own Steamify (input steamify_ref of the ISO workflow), not the newest published release: release/2.9.6 kept producing 2.9.5 ISOs** - **docs: changelog hashes for 2.9.6** - `9a2965d` **fix(ci): the ISO workflow always runs from master; main asks for a release ISO, a release branch for a dev ISO (input `kind` of iso-1-github-tag.yml; feat/steamify is no longer needed)** - `c42d545` **fix(ci): a version published from main starts a real ISO release, a release branch a dev ISO (it always started the dev one)**