From b3bed4385485e24525ff71b58c50e49b6636fff6 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 11:31:25 +0200 Subject: [PATCH 1/5] chore: Version 2.9.6 --- CHANGELOG.md | 4 ++++ steamify.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81cb858..0eff65e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes, per version and per commit. Versions follow `steamify.sh`. Versions before 0.7.0 were numbered afterwards, one per merged pull request. +## 2.9.6 - 2026-09-30 + +- **chore: Version 2.9.6** + ## 2.9.5 - 2026-09-30 - `70ecb56` **ci: trigger a mirror sync** diff --git a/steamify.sh b/steamify.sh index 4658143..7a0a987 100755 --- a/steamify.sh +++ b/steamify.sh @@ -15,7 +15,7 @@ set -uo pipefail # Release version, see CHANGELOG.md. -VERSION=2.9.5 +VERSION=2.9.6 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" From c42d5454bff587b3e732c083003065dbf2f09c23 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 11:31:37 +0200 Subject: [PATCH 2/5] 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 From 9a2965d339c01f68cfa7c4df5c9e2286cedb8584 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 11:32:36 +0200 Subject: [PATCH 3/5] fix(ci): the ISO workflow always runs from master; main asks for a release ISO, a release branch for a dev ISO --- .github/workflows/bundle.yml | 15 ++++++++------- CHANGELOG.md | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) 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 From 9eab3978a983e19b893eca3ab5a81a10b1c8967f Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 12:32:39 +0200 Subject: [PATCH 4/5] docs: changelog hashes for 2.9.6 --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7bb7e..f1522a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ one per merged pull request. ## 2.9.6 - 2026-09-30 -- **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** +- **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)** +- `b3bed43` **chore: Version 2.9.6** ## 2.9.5 - 2026-09-30 @@ -17,7 +19,7 @@ one per merged pull request. - `b3549d4` **ci: sync the mirror on release branch pushes too** - `a232a55` **feat(ci): sync the git.upriser.nl mirror on every push to main and every tag (git-upriser-sync.yml calls the mirror-sync API: the Gitea mirror builds at once instead of at its interval; secrets GIT_UPRISER_URL and GIT_UPRISER_TOKEN, retried, skipped on Gitea itself)** - `3676c64` **docs: link the renamed steamify-cachyos-live-iso repo (the release dispatches the ISO workflow iso-1-github-tag.yml there)** -- **chore: Version 2.9.5** +- `971e792` **chore: Version 2.9.5** ## 2.9.4 - 2026-09-29 From 7a54a2fa59cc9dc7a61f267f4c9bbe628e06b0e6 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Wed, 30 Sep 2026 12:45:14 +0200 Subject: [PATCH 5/5] 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)**