From b978e8884ea5c5e2a889bcbdcaf41a3feda40d81 Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Fri, 16 Oct 2026 23:55:27 +0200 Subject: [PATCH] CI: back on the stable crafter-build Flatpak, now that 2.2.0 carries the Shader API Crafter.Build 2.2.0 (2026-10-16) releases the Shader `defines` and `variant` fields Crafter.Graphics master has used since 2026-10-06, so CRAFTER_REF goes back to //stable and the toolchain moves only with a Crafter.Build release again, the way imsd's package job has it. The comments and the README now describe beta as the stopgap for the next time Crafter.Graphics runs ahead of a release. Co-Authored-By: Claude Fable 5.1 --- .forgejo/workflows/deploy.yaml | 13 +++++++------ deploy/README.md | 16 +++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 45c9a69..6d5aa3a 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -26,12 +26,13 @@ jobs: # Which crafter-build. `stable` is the branch Crafter.Build publishes # from its release tags, `beta` follows every push to its master (the # same thing the rolling `latest` tarball this job used to download - # was). This site tracks Crafter.Graphics master, which since 2026-10-06 - # uses the Shader `defines`/`variant` fields that only Crafter.Build - # master has: the 2.1.0 release predates them by three days, and run - # 533 failed on exactly that. Flip to //stable once a Crafter.Build - # release carries them. imsd pins stable; it has no Crafter.Graphics. - CRAFTER_REF: net.catcrafts.CrafterBuild//beta + # was). Stable, like imsd: the toolchain then moves only with a + # Crafter.Build release. This site tracks Crafter.Graphics master, so a + # Crafter.Graphics change that needs a newer Crafter.Build API fails + # here until that API is released: run 533 (2026-10-12) did, on the + # Shader `defines`/`variant` fields that 2.1.0 predated; 2.2.0 + # (2026-10-16) carries them. Switching to //beta is the stopgap. + CRAFTER_REF: net.catcrafts.CrafterBuild//stable steps: - name: Check live payment test credentials # ShouldSettleEurcOnTestnet is a mandatory deploy gate, so a missing diff --git a/deploy/README.md b/deploy/README.md index 658cc06..5546467 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1040,13 +1040,15 @@ sandbox, which is what CI's `crafter-run` wrapper does: Which branch of the Flatpak CI builds with is `CRAFTER_REF` at the top of `.forgejo/workflows/deploy.yaml`. `stable` is published from Crafter.Build's -release tags, `beta` from every push to its master. The site tracks -Crafter.Graphics master, and since 2026-10-06 that uses Shader fields that -only Crafter.Build master has, so CI is on `beta` until a release carries -them (`flatpak run --command=sh net.catcrafts.CrafterBuild//beta -c -'crafter-build --version'` prints which master commit a beta is). Note that -`flatpak install` of an already-installed ref is a no-op even when the remote -has moved on; `flatpak update` is what moves it, and the workflow runs both. +release tags, `beta` from every push to its master. CI is on `stable`, so the +toolchain moves only with a Crafter.Build release. The site tracks +Crafter.Graphics master, so a Crafter.Graphics change that needs a newer +Crafter.Build API fails the deploy until that API is released (2026-10-12: +the Shader fields 2.1.0 lacked, released in 2.2.0 four days later); `beta` is +the stopgap, and `crafter-build --version` inside it prints which master +commit it is. Note that `flatpak install` of an already-installed ref is a +no-op even when the remote has moved on; `flatpak update` is what moves it, +and the workflow runs both. ### If a `bin/` glob matches two directories