Merge pull request #71 from theupriser/release/2.9.6

Release/2.9.6

.github/workflows/bundle.yml

@@ -192,14 +192,18 @@ 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
+      # A new version starts the Steamify ISO's release of the ISO repo: its iso-1-github-tag.yml (always run from
-      # feat/steamify, until that is its master): its iso-release.yml names it after this version, tags it,
+      # master) names the ISO after the newest Steamify release, tags it, and the Gitea mirror builds and attaches the ISO.
-      # and the Gitea mirror builds and attaches the ISO. Needs a fine-grained token for that repo
+      # The branch here decides the kind of build (the workflow's input `kind`):
-      # (Actions: read and write) as the secret ISO_DISPATCH_TOKEN; without it, this is skipped.
+      #   main (publishes the release)            -> release: a real ISO (tag v<steamify>-<date>)
+      #   release/** (a version not yet released) -> dev: a pre-release (tag v<steamify>-dev.<date>)
+      # 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 +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
-          gh workflow run iso-release.yml -R theupriser/steammachine-cachyos-live-iso --ref feat/steamify
+          # A release branch builds the ISO with its own code (and VERSION): steamify_ref. main builds the release it just published.
-          echo "Started the Steamify ISO's release (theupriser/steammachine-cachyos-live-iso, feat/steamify)"
+          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})"

.github/workflows/git-upriser-sync.yml

@@ -0,0 +1,26 @@
+name: Sync git.upriser.nl mirror
+
+# Trigger the Gitea pull-mirror immediately instead of waiting for its interval,
+# so Gitea builds/tests right after any branch or tag lands on GitHub (the mirror has no sync interval of its own).
+on:
+  push:
+    branches: ['**']
+    tags: ['*']
+  workflow_dispatch:
+
+jobs:
+  sync:
+    # Gitea also reads .github/workflows on the mirror; only run on GitHub
+    if: github.server_url == 'https://github.com'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger mirror-sync
+        env:
+          GITEA_URL: ${{ secrets.GIT_UPRISER_URL }}
+          GIT_UPRISER_TOKEN: ${{ secrets.GIT_UPRISER_TOKEN }}
+          # Gitea "owner/repo"; defaults to the same path as on GitHub
+          GITEA_REPO: ${{ vars.GITEA_REPO || github.repository }}
+        run: |
+          curl --fail-with-body -sS --retry 5 --retry-delay 10 --retry-all-errors -X POST \
+            -H "Authorization: token ${GIT_UPRISER_TOKEN}" \
+            "${GITEA_URL%/}/api/v1/repos/${GITEA_REPO}/mirror-sync"

.github/workflows/vmtest.yml

@@ -1,209 +0,0 @@
-# Steamify's own test run on the Gitea mirror (git.upriser.nl, its own runner; skipped on GitHub): the same as
-# `scripts/vmtest.sh` in steamify-cachyos-dev, on this commit's steamify.sh. The base is the newest Steamify ISO
-# release of the mirror (steamify-cachyos-live-iso): the boot loader tests (limine, systemd-boot, grub) install
-# it with this commit's Steamify, then the suites (cli, menu, hw, installer, toggles) run on a plain VM from
-# the same ISO (its Steamify step skipped: the suites start from a system without Steamify).
-# The runner needs /dev/kvm and privileged containers, about 12 GB of RAM for two VMs at a time (6 GB to
-# install, 4 GB to test, 2 vCPUs each).
-name: Steamify VM tests (Gitea)
-
-on:
-  push:
-    branches: [main, 'release/**']
-  pull_request:
-  workflow_dispatch:
-
-# A new run on the same branch or pull request stops the old one.
-concurrency:
-  group: vmtest-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  iso:
-    name: Newest Steamify ISO
-    if: github.server_url != 'https://github.com'
-    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.find.outputs.tag }}
-      url: ${{ steps.find.outputs.url }}
-    steps:
-      - name: Find the newest ISO release on the mirror
-        id: find
-        run: |
-          api="${{ github.server_url }}/api/v1/repos/theupriser/steamify-cachyos-live-iso/releases?limit=20"
-          read -r tag url < <(curl -fsS "$api" | python3 -c '
-          import json, sys
-          for r in json.load(sys.stdin):
-              for a in r["assets"]:
-                  if a["name"].endswith(".iso"):
-                      print(r["tag_name"], a["browser_download_url"]); raise SystemExit
-          ')
-          [ -n "$tag" ] || { echo "::error::no ISO release on the mirror"; exit 1; }
-          echo "Using $tag"
-          { echo "tag=$tag"; echo "url=$url"; } >> "$GITHUB_OUTPUT"
-
-  boot:
-    name: Boot loader ${{ matrix.loader }}
-    needs: iso
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-    container:
-      image: docker.io/cachyos/cachyos:latest
-      options: --privileged
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        loader: [limine, systemd-boot, grub]
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Node and git
-        id: node
-        run: |
-          pacman-key --init && pacman-key --populate
-          pacman -Syu --noconfirm --needed nodejs git
-          echo "week=$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
-      - name: Cache - pacman packages
-        uses: actions/cache@v4
-        with:
-          path: /var/cache/pacman/pkg
-          key: pacman-test-${{ steps.node.outputs.week }}
-          restore-keys: pacman-test-
-      - name: Cache - the VMs' packages
-        uses: actions/cache@v4
-        with:
-          path: /root/vms/pkg-cache
-          key: vmpkg-steamify-${{ steps.node.outputs.week }}
-          restore-keys: vmpkg-
-      - name: Tools and KVM
-        run: |
-          pacman -S --noconfirm --needed qemu-desktop edk2-ovmf openssh libarchive procps-ng util-linux python curl sudo
-          [ -c /dev/kvm ] || { echo "::error::no /dev/kvm in this container: the runner needs KVM (and privileged containers)"; exit 1; }
-      - name: Cache - the ISO
-        uses: actions/cache@v4
-        with:
-          path: iso
-          key: steamify-iso-${{ needs.iso.outputs.tag }}
-
-      # steamify-cachyos-dev (the scripts) and this commit of steamify-cachyos side by side (9p `repo` in the VMs).
-      - uses: actions/checkout@v4
-        with:
-          path: steamify-cachyos
-      - uses: actions/checkout@v4
-        with:
-          repository: theupriser/steamify-cachyos-dev
-          path: steamify-cachyos-dev
-      - name: ISO
-        run: |
-          mkdir -p iso
-          [ -n "$(ls iso/*.iso 2>/dev/null)" ] || curl -fL --retry 5 --retry-all-errors -o "iso/${{ needs.iso.outputs.tag }}.iso" "${{ needs.iso.outputs.url }}"
-      - name: Boot loader test (${{ matrix.loader }})
-        env:
-          CI: "1"
-          VM_TIMEZONE: UTC
-          VM_CPUS: "2"
-          VM_INSTALL_MEM: 6G
-        run: |
-          mkdir -p ~/.ssh ~/vms/pkg-cache
-          ssh-keygen -q -t ed25519 -N "" -C steamify-vm -f ~/.ssh/steamify-vm_ed25519
-          cd steamify-cachyos-dev
-          VM_ISO="$(ls "$GITHUB_WORKSPACE"/iso/*.iso | head -n 1)" scripts/vmbootloadertest.sh "${{ matrix.loader }}" --install
-      - name: Logs
-        if: always()
-        uses: christopherhx/gitea-upload-artifact@v4
-        with:
-          name: boot-${{ matrix.loader }}
-          path: |
-            /root/vms/bl-${{ matrix.loader }}.test.log
-            /root/vms/bl-${{ matrix.loader }}/vm.log
-          retention-days: 7
-          if-no-files-found: ignore
-
-  suites:
-    name: Suites (vmtest.sh)
-    needs: [iso, boot]
-    runs-on: ubuntu-latest
-    timeout-minutes: 150
-    container:
-      image: docker.io/cachyos/cachyos:latest
-      options: --privileged
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Node and git
-        id: node
-        run: |
-          pacman-key --init && pacman-key --populate
-          pacman -Syu --noconfirm --needed nodejs git
-          echo "week=$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
-      - name: Cache - pacman packages
-        uses: actions/cache@v4
-        with:
-          path: /var/cache/pacman/pkg
-          key: pacman-test-${{ steps.node.outputs.week }}
-          restore-keys: pacman-test-
-      - name: Cache - the VMs' packages
-        uses: actions/cache@v4
-        with:
-          path: /root/vms/pkg-cache
-          key: vmpkg-steamify-${{ steps.node.outputs.week }}
-          restore-keys: vmpkg-
-      - name: Tools and KVM
-        run: |
-          pacman -S --noconfirm --needed qemu-desktop edk2-ovmf openssh libarchive procps-ng util-linux python curl sudo
-          [ -c /dev/kvm ] || { echo "::error::no /dev/kvm in this container: the runner needs KVM (and privileged containers)"; exit 1; }
-      - name: Cache - the ISO
-        uses: actions/cache@v4
-        with:
-          path: iso
-          key: steamify-iso-${{ needs.iso.outputs.tag }}
-
-      # vmtest.sh wants the live-iso repository too (which boot loaders the ISO advertises).
-      - uses: actions/checkout@v4
-        with:
-          path: steamify-cachyos
-      - uses: actions/checkout@v4
-        with:
-          repository: theupriser/steamify-cachyos-dev
-          path: steamify-cachyos-dev
-      - uses: actions/checkout@v4
-        with:
-          repository: theupriser/steamify-cachyos-live-iso
-          path: steamify-cachyos-live-iso
-      - name: ISO
-        run: |
-          mkdir -p iso
-          [ -n "$(ls iso/*.iso 2>/dev/null)" ] || curl -fL --retry 5 --retry-all-errors -o "iso/${{ needs.iso.outputs.tag }}.iso" "${{ needs.iso.outputs.url }}"
-      - name: Base VM from the ISO
-        env:
-          CI: "1"
-          VM_TIMEZONE: UTC
-          VM_CPUS: "2"
-          VM_INSTALL_MEM: 6G
-          VM_STEAMIFY: skip
-        run: |
-          mkdir -p ~/.ssh ~/vms/pkg-cache
-          ssh-keygen -q -t ed25519 -N "" -C steamify-vm -f ~/.ssh/steamify-vm_ed25519
-          cd steamify-cachyos-dev
-          VM_DIR="$HOME/vms/steamify-vm" scripts/vminstall.sh --iso "$(ls "$GITHUB_WORKSPACE"/iso/*.iso | head -n 1)"
-      - name: vmtest.sh (every suite)
-        env:
-          CI: "1"
-          VM_CPUS: "2"
-          MAX_PARALLEL: "2"
-        run: |
-          cd steamify-cachyos-dev
-          scripts/vmtest.sh cli menu hw installer toggles
-      - name: Logs
-        if: always()
-        uses: christopherhx/gitea-upload-artifact@v4
-        with:
-          name: suites
-          path: |
-            /root/vms/last-test.txt
-            /root/vms/run-*.log
-          retention-days: 7
-          if-no-files-found: ignore

AGENTS.md

@@ -73,7 +73,7 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
   `upload-artifact@v4` on GitHub and `christopherhx/gitea-upload-artifact@v4` elsewhere: never mention
   `upload-artifact@v3`, GitHub fails a workflow for a deprecated version even in a skipped step); the
   release is `gh` on GitHub and `akkuman/gitea-release-action` on Gitea. A new release on GitHub also starts the
-  Steamify ISO's release (`gh workflow run iso-release.yml` in steammachine-cachyos-live-iso, secret
+  Steamify ISO's release (`gh workflow run iso-1-github-tag.yml` in steamify-cachyos-live-iso, secret
   `ISO_DISPATCH_TOKEN`; skipped without it): the ISO repo's GitHub tag names it, the Gitea mirror builds it.
   CI (`.github/workflows/bundle.yml`) publishes the bundle as release
   `v$VERSION` on pushes to `main`; an existing version is never overwritten,
@@ -308,7 +308,7 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
   (`state_get vram installed_pkgs`).
 - Install-time mode (`steamify.sh --defaults`, 2.6.0): applies what the menu
   would preselect, no menu or prompts (needs passwordless sudo). The Steam
-  Machine ISO ([steammachine-cachyos-live-iso](https://github.com/theupriser/steammachine-cachyos-live-iso))
+  Machine ISO ([steamify-cachyos-live-iso](https://github.com/theupriser/steamify-cachyos-live-iso))
   runs it in the installer for a user who has never logged in: no session
   bus, user systemd or plasmashell. So every `systemctl --user` goes through
   `user_systemctl` (`lib/common.sh`; without a session only unit files change,

CHANGELOG.md

@@ -5,6 +5,23 @@ 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
+
+- **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)**
+- `b3bed43` **chore: Version 2.9.6**
+
+## 2.9.5 - 2026-09-30
+
+- `70ecb56` **ci: trigger a mirror sync**
+- `a7276cf` **ci: sync the git.upriser.nl mirror on every branch and tag**
+- `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)**
+- `971e792` **chore: Version 2.9.5**
+
 ## 2.9.4 - 2026-09-29
 
 - `619ef1f` **docs: AGENTS.md and TECHNICAL.md: the CEC driver cache, the one workflow for GitHub and a Gitea mirror, and that a new release starts the Steamify ISO's release**

README.md

@@ -94,7 +94,7 @@ curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/downlo
 ```
 
 Installing CachyOS on a Steam Machine? The
-[Steamify CachyOS ISO](https://github.com/theupriser/steammachine-cachyos-live-iso)
+[Steamify CachyOS ISO](https://github.com/theupriser/steamify-cachyos-live-iso)
 has Steamify built into the installer: pick the options there, and the
 first boot is already set up.
 

steamify.sh

@@ -15,7 +15,7 @@
 set -uo pipefail
 
 # Release version, see CHANGELOG.md.
-VERSION=2.9.4
+VERSION=2.9.6
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"