Merge pull request #6 from theupriser/feature/iso-label

feat: the ISO's label follows the Steamify version and the build time

.github/workflows/build.yml

@@ -11,6 +11,9 @@ concurrency:
 
 jobs:
   build:
+    # CachyOS's plain ISO and its quicktest matrix: only in CachyOS's own repo, not in this fork
+    # (the Steamify ISO is steamify-iso.yml).
+    if: github.repository == 'CachyOS/CachyOS-Live-ISO'
     runs-on: ubuntu-latest
     container:
       image: archlinux:base-devel

.github/workflows/steamify-iso.yml

@@ -0,0 +1,102 @@
+# The Steamify ISO, built and released on the Gitea mirror (git.upriser.nl) by its own runner: the same
+# build as by hand (the wsl-build-host skill in steamify-cachyos-dev), then a Gitea release with the ISO,
+# its checksums and package list, notes from CHANGELOG.md's Steamify section. The ISO's version is the
+# Steamify version on it plus the build date and time (UTC): master releases v<steamify>-<date>-<HHMM>,
+# feat/steamify a pre-release v<steamify>-dev.<date>-<HHMM>. Never overwritten. GitHub skips it (one file
+# for both servers; GitHub releases take at most 2 GB per file, the ISO is bigger).
+# The runner needs privileged containers (archiso mounts loop devices) and ~20 GB of disk; Gitea's
+# [attachment] MAX_SIZE must allow the ISO (default 2 GB).
+name: Steamify ISO (Gitea release)
+
+on:
+  push:
+    branches: [master, feat/steamify]
+  workflow_dispatch:
+
+concurrency:
+  group: steamify-iso
+  cancel-in-progress: true
+
+jobs:
+  iso:
+    if: github.server_url != 'https://github.com'
+    runs-on: ubuntu-latest
+    container:
+      image: docker.io/cachyos/cachyos:latest
+      options: --privileged
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Tools
+        run: |
+          pacman-key --init && pacman-key --populate
+          # nodejs: the actions below run in this container
+          pacman -Syu --noconfirm --needed archiso mkinitcpio-archiso git squashfs-tools grub sudo nodejs curl jq
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Steamify on the ISO (its newest release)
+        run: |
+          ./steamify-prepare.sh
+          # One moment for the ISO's label (profiledef.sh) and the release's name.
+          echo "STEAMIFY_BUILD_STAMP=$(date -u +%Y%m%d_%H%M)" >> "$GITHUB_ENV"
+
+      - name: Build
+        run: |
+          ./build-live-modules.sh
+          ./build-calamares-modules.sh
+          ./buildiso.sh -p desktop -w || ./buildiso.sh -p desktop -c -w
+
+      - name: Release name and notes
+        id: rel
+        env:
+          TOKEN: ${{ github.token }}
+        run: |
+          iso="$(ls out/desktop/*.iso | head -n 1)"
+          [ -f "$iso" ] || { echo "::error::no ISO in out/desktop"; exit 1; }
+          steamify="$(sed -n 's/^VERSION=//p' archiso/airootfs/usr/local/share/steamify/steamify.sh | head -n 1)"
+          [ -n "$steamify" ] || { echo "::error::no Steamify version on the ISO"; exit 1; }
+          api="${{ github.server_url }}/api/v1/repos/${{ github.repository }}"
+          exists() { curl -fsS -o /dev/null -H "Authorization: token $TOKEN" "$api/releases/tags/$1"; }
+          b="$STEAMIFY_BUILD_STAMP"   # YYYYMMDD_HHMM (UTC), the same moment as the ISO's label
+          stamp="${b:0:4}.${b:4:2}.${b:6:2}-${b:9:4}"   # every build its own name
+          if [ "${{ github.ref }}" = refs/heads/master ]; then
+            tag="v$steamify-$stamp" prerelease=false name="CachyOS with Steamify Live ISO $steamify ($stamp UTC)"
+          else
+            tag="v$steamify-dev.$stamp" prerelease=true name="CachyOS with Steamify Live ISO $steamify (test build $stamp UTC)"
+          fi
+          # Never overwritten (a rerun in the same minute would find its tag taken).
+          if exists "$tag"; then
+            echo "::warning::$tag is already released and won't be overwritten."
+            echo "publish=false" >> "$GITHUB_OUTPUT"; exit 0
+          fi
+          { echo "publish=true"; echo "tag=$tag"; echo "prerelease=$prerelease"; echo "name=$name"; } >> "$GITHUB_OUTPUT"
+          # The Steamify section of CHANGELOG.md ("## CachyOS with Steamify Live ISO"), without its heading.
+          section="$(awk '/^## CachyOS with Steamify Live ISO/ {found = 1; next} found && /^#/ {exit} found' CHANGELOG.md)"
+          {
+            echo "Built $(date -u '+%F %H:%M UTC') from \`$(git rev-parse --short HEAD)\` (${{ github.ref_name }}), with Steamify $steamify."
+            echo
+            echo "SHA-256: \`$(cut -d' ' -f1 "$iso.sha256")\`, label \`STEAMIFY_${steamify//./_}_$b\`"
+            echo
+            echo "$section"
+          } > release-notes.md
+          cat release-notes.md
+
+      - name: Publish ${{ steps.rel.outputs.tag }}
+        if: steps.rel.outputs.publish == 'true'
+        uses: akkuman/gitea-release-action@v1.3.7
+        with:
+          token: ${{ github.token }}
+          tag_name: ${{ steps.rel.outputs.tag }}
+          target_commitish: ${{ github.sha }}
+          name: ${{ steps.rel.outputs.name }}
+          body_path: release-notes.md
+          prerelease: ${{ steps.rel.outputs.prerelease }}
+          files: |
+            out/desktop/*.iso
+            out/desktop/*.iso.sha256
+            out/desktop/*.iso.sha1
+            out/desktop/*.pkgs.txt

CHANGELOG.md

@@ -26,12 +26,13 @@
   * Correctly handle VM environments
   * Correctly quote pacman arguments
 
-## CachyOS with Steamify Live ISO 1.0.0 (unreleased)
+## CachyOS with Steamify Live ISO
 CachyOS 26.08 with Steamify built in: install CachyOS and turn the PC into a Steam Machine in one go.
+Its version is the Steamify version on it plus the build date and time (a release on `master` is `v<Steamify version>-<date>-<HHMM UTC>`, e.g. `v2.9.1-2026.09.29-1432`).
 
 **Features:**
 
-* **ISO:** called `steamify-cachyos-<date>-x86_64.iso`; CachyOS Hello installs it like CachyOS's own
+* **ISO:** called `steamify-cachyos-<date>-x86_64.iso`, labelled after the Steamify version on it and the build time (`STEAMIFY_2_9_1_20260929_1432`, was CachyOS's `COS_<year><month>`); CachyOS Hello installs it like CachyOS's own
   release (the build date is kept in `/etc/steammachine-iso-build`)
 * **Installer (CachyOS - Steamify Installer):**
   * A Steamify page after the packages page: which Steam Machine parts to set up (rows from

archiso/profiledef.sh

@@ -2,7 +2,14 @@
 # shellcheck disable=SC2034
 
 iso_name="steamify-cachyos"
-iso_label="COS_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)"
+# The label follows the release name: the Steamify version on the ISO (steamify-prepare.sh put it there)
+# plus the build date and time, e.g. STEAMIFY_2_9_1_20260929_1432 (ISO 9660: at most 32 characters,
+# A-Z 0-9 _). STEAMIFY_BUILD_STAMP (YYYYMMDD_HHMM, UTC) from the release workflow, so both name the same
+# moment; built by hand, the time now.
+_steamify="$(sed -n 's/^VERSION=//p' "${BASH_SOURCE[0]%/*}/airootfs/usr/local/share/steamify/steamify.sh" 2>/dev/null | head -n 1)"
+_stamp="${STEAMIFY_BUILD_STAMP:-$(date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d_%H%M)}"
+iso_label="STEAMIFY_${_steamify:+${_steamify//./_}_}${_stamp}"
+iso_label="${iso_label:0:32}"
 iso_publisher="CachyOS <https://cachyos.org>"
 iso_application="Steamify CachyOS Live (based on CachyOS)"
 iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"