From 3df5d5fccf3be23abb6ef21ca7bfded717898aa9 Mon Sep 17 00:00:00 2001 From: ospab Date: Thu, 9 Jul 2026 02:43:07 +0300 Subject: [PATCH] ci: remove push branches to save GHA minutes, update script to beta --- .github/workflows/release.yml | 3 --- scripts/gha.ps1 | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 568839c..1a82336 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,6 @@ on: push: tags: - "v*" - branches: - - nightly - - pre-release workflow_dispatch: inputs: channel: diff --git a/scripts/gha.ps1 b/scripts/gha.ps1 index 6145458..e52e1ac 100644 --- a/scripts/gha.ps1 +++ b/scripts/gha.ps1 @@ -6,12 +6,12 @@ .DESCRIPTION Three release channels, in increasing order of stability: nightly -> pushes the `nightly` branch -> tag "{version}-nightly" - pre-release -> pushes the `pre-release` branch -> tag "{version}-beta" + beta -> pushes the `beta` branch -> tag "{version}-beta" master -> pushes an actual "v{version}" tag -> real stable release - Promoting to pre-release/master first fast-forwards that branch to + Promoting to beta/master first fast-forwards that branch to `nightly` (--ff-only — this always succeeds cleanly as long as nobody ever - commits directly to pre-release/master, per CONTRIBUTING.md's branch + commits directly to beta/master, per CONTRIBUTING.md's branch strategy), so a release always ships nightly's latest, not a stale branch. Remembers the last {version, branch, prefix} it used in .release-state.json @@ -25,7 +25,7 @@ of the last released version. Becomes the new baseline for future bare runs. .PARAMETER Branch - Which branch to release from: master, pre-release, or nightly. + Which branch to release from: master, beta, or nightly. Defaults to whatever was used last time (see .release-state.json). .PARAMETER Prefix @@ -42,13 +42,13 @@ Starts releasing the 0.4.x line from now on; this run ships exactly 0.4.0. .EXAMPLE - .\scripts\gha.ps1 -Branch pre-release -Prefix beta - Promotes nightly -> pre-release and ships "{version}-beta". + .\scripts\gha.ps1 -Branch beta -Prefix beta + Promotes nightly -> beta and ships "{version}-beta". #> [CmdletBinding()] param( [string]$Switch, - [ValidateSet('master', 'pre-release', 'nightly')] + [ValidateSet('master', 'beta', 'nightly')] [string]$Branch, [ValidateSet('beta', 'nightly')] [string]$Prefix @@ -183,7 +183,7 @@ git add Cargo.toml Cargo.lock ostp-gui/src-tauri/Cargo.toml ostp-gui/src-tauri/C .release-state.json git commit -m $commitMsg | Out-Null -# ── Push: branch push for nightly/pre-release (CI computes the tag itself), ─ +# ── Push: branch push for nightly/beta (CI computes the tag itself), ─ # ── a real "vX.Y.Z" tag for master (the only path that yields a stable ─ # ── release per release.yml's resolve-channel job). ─ if ($ResolvedBranch -eq "master") {