CI: single-trunk model — dev triggers on main, beta becomes RC-tag-triggered
Replaces the dev/beta branch split with one trunk (main): dev-track builds still publish on every push, but the beta track now publishes from a vX.Y.Z-rc.N prerelease tag instead of a separately-maintained beta branch. Removes the branch nobody reliably kept in sync.
This commit is contained in:
parent
a0bb9099cb
commit
09789f53ef
4 changed files with 63 additions and 100 deletions
|
|
@ -1,92 +0,0 @@
|
||||||
name: beta release
|
|
||||||
|
|
||||||
# Publishes a beta-track build on every push to `beta` — a frozen
|
|
||||||
# stabilization branch cut from `dev` when ready to stabilize; only
|
|
||||||
# fix/<issue> branches merged into `beta` should land here afterward.
|
|
||||||
# See bread-ecosystem's docs/release-channels.md for the three-track policy.
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: ['beta']
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: [self-hosted, hestia]
|
|
||||||
steps:
|
|
||||||
- name: checkout
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
rm -rf src && mkdir src
|
|
||||||
git clone --branch beta --depth 1 \
|
|
||||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
|
||||||
|
|
||||||
# bos-settings is a Tauri app: Cargo.toml lives at src/src/Cargo.toml
|
|
||||||
# (checkout root is named "src" by convention above; the repo's own
|
|
||||||
# Rust backend is also in a dir called "src", not the usual
|
|
||||||
# src-tauri — hence src/src below), and the Rust build expects the
|
|
||||||
# frontend already built at frontend/build (tauri.conf.json's
|
|
||||||
# frontendDist) — that only happens automatically under `cargo
|
|
||||||
# tauri build`, so it's run explicitly here since this workflow
|
|
||||||
# just uses plain `cargo build`.
|
|
||||||
- name: build frontend
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd src/frontend
|
|
||||||
npm ci
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
- name: build
|
|
||||||
run: cd src/src && cargo build --release --locked
|
|
||||||
|
|
||||||
- name: compute beta version
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd src
|
|
||||||
# Base the beta version off the latest published stable tag,
|
|
||||||
# not Cargo.toml — Cargo.toml can go stale relative to the last
|
|
||||||
# real release, which would make a beta build sort as OLDER than
|
|
||||||
# what's already installed and bakery would correctly refuse it.
|
|
||||||
LATEST_TAG="$(git ls-remote --tags --refs \
|
|
||||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" 'v*' \
|
|
||||||
| awk -F/ '{print $NF}' | sed 's/^v//' | sort -V | tail -1)"
|
|
||||||
if [ -n "${LATEST_TAG}" ]; then
|
|
||||||
CUR="${LATEST_TAG}"
|
|
||||||
else
|
|
||||||
CUR="$(grep -m1 '^version' Cargo.toml | sed -E 's/.*"(.*)".*/\1/')"
|
|
||||||
fi
|
|
||||||
IFS='.' read -r MA MI PA <<< "${CUR}"
|
|
||||||
SHA="$(git rev-parse --short HEAD)"
|
|
||||||
TS="$(date -u +%Y%m%d%H%M%S)"
|
|
||||||
echo "VERSION=${MA}.${MI}.$((PA + 1))-beta.${TS}+${SHA}" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: prepare artifacts
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
PKG_DIR="/srv/breadway-dl/beta/bos-settings/${VERSION}"
|
|
||||||
mkdir -p "${PKG_DIR}"
|
|
||||||
cp "src/src/target/release/bos-settings" "${PKG_DIR}/bos-settings-x86_64"
|
|
||||||
strip "${PKG_DIR}/bos-settings-x86_64"
|
|
||||||
sha256sum "${PKG_DIR}/bos-settings-x86_64" | awk '{print $1}' \
|
|
||||||
> "${PKG_DIR}/bos-settings-x86_64.sha256"
|
|
||||||
cp src/packaging/bos-settings.desktop "${PKG_DIR}/"
|
|
||||||
cp src/LICENSE "${PKG_DIR}/"
|
|
||||||
cp src/bakery.toml "${PKG_DIR}/bakery.toml"
|
|
||||||
ln -sfn "${VERSION}" "/srv/breadway-dl/beta/bos-settings/latest"
|
|
||||||
|
|
||||||
# No GitHub Release upload — beta, like dev, is only distributed via
|
|
||||||
# dl.breadway.dev/beta/.
|
|
||||||
- name: regenerate beta index.json
|
|
||||||
env:
|
|
||||||
MINISIGN_SEC_KEY: ${{ secrets.BAKERY_MINISIGN_SEC_KEY_PATH }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
if [ -z "${MINISIGN_SEC_KEY:-}" ]; then
|
|
||||||
echo "::error::BAKERY_MINISIGN_SEC_KEY_PATH secret not set — refusing to regenerate beta index.json unsigned (would leave a stale signature mismatched against fresh content and break bakery for everyone on the beta track)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -rf /tmp/bread-ecosystem-ci-* 2>/dev/null || true
|
|
||||||
# mktemp: a fixed clone path races when multiple repos' dev/beta
|
|
||||||
# workflows run close together on the same self-hosted runner.
|
|
||||||
ECOSYSTEM_CI_DIR="$(mktemp -d /tmp/bread-ecosystem-ci-XXXXXX)"
|
|
||||||
git clone https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
|
||||||
TRACK=beta bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
|
||||||
rm -rf "${ECOSYSTEM_CI_DIR}"
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
name: dev release
|
name: dev release
|
||||||
|
|
||||||
# Publishes a dev-track build on every push to `dev` —
|
# Publishes a dev-track build on every push to `main` (the trunk
|
||||||
# separate from release.yml's tag-triggered stable releases. See
|
# branch — there is no separate `dev` branch). See bread-ecosystem's
|
||||||
# bread-ecosystem's docs/release-channels.md for the three-track policy
|
# docs/release-channels.md for the release-track policy this is part of.
|
||||||
# this is part of.
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ['dev']
|
branches: ['main']
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -16,7 +15,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
rm -rf src && mkdir src
|
rm -rf src && mkdir src
|
||||||
git clone --branch dev --depth 1 \
|
git clone --branch main --depth 1 \
|
||||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||||
|
|
||||||
# bos-settings is a Tauri app: Cargo.toml lives at src/src/Cargo.toml
|
# bos-settings is a Tauri app: Cargo.toml lives at src/src/Cargo.toml
|
||||||
|
|
@ -47,7 +46,7 @@ jobs:
|
||||||
# what's already installed and bakery would correctly refuse it.
|
# what's already installed and bakery would correctly refuse it.
|
||||||
LATEST_TAG="$(git ls-remote --tags --refs \
|
LATEST_TAG="$(git ls-remote --tags --refs \
|
||||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" 'v*' \
|
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" 'v*' \
|
||||||
| awk -F/ '{print $NF}' | sed 's/^v//' | sort -V | tail -1)"
|
| awk -F/ '{print $NF}' | sed 's/^v//' | (grep -v -- '-' || true) | sort -V | tail -1)"
|
||||||
if [ -n "${LATEST_TAG}" ]; then
|
if [ -n "${LATEST_TAG}" ]; then
|
||||||
CUR="${LATEST_TAG}"
|
CUR="${LATEST_TAG}"
|
||||||
else
|
else
|
||||||
|
|
@ -87,6 +86,6 @@ jobs:
|
||||||
# mktemp: a fixed clone path races when multiple repos' dev/beta
|
# mktemp: a fixed clone path races when multiple repos' dev/beta
|
||||||
# workflows run close together on the same self-hosted runner.
|
# workflows run close together on the same self-hosted runner.
|
||||||
ECOSYSTEM_CI_DIR="$(mktemp -d /tmp/bread-ecosystem-ci-XXXXXX)"
|
ECOSYSTEM_CI_DIR="$(mktemp -d /tmp/bread-ecosystem-ci-XXXXXX)"
|
||||||
git clone --branch dev https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
git clone --branch main https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
||||||
TRACK=dev bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
TRACK=dev bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
||||||
rm -rf "${ECOSYSTEM_CI_DIR}"
|
rm -rf "${ECOSYSTEM_CI_DIR}"
|
||||||
|
|
|
||||||
55
.forgejo/workflows/rc-release.yml
Normal file
55
.forgejo/workflows/rc-release.yml
Normal file
|
|
@ -0,0 +1,55 @@
|
||||||
|
name: beta (rc) release
|
||||||
|
|
||||||
|
# Publishes a beta-track build for any `vX.Y.Z-rc.N` prerelease tag
|
||||||
|
# pushed to `main` — there is no separate `beta` branch; "freezing" is
|
||||||
|
# just pausing pushes to main while an RC gets tested. See
|
||||||
|
# bread-ecosystem's docs/release-channels.md for the release-track policy.
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags: ['v*']
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
if: ${{ contains(github.ref_name, '-rc.') }}
|
||||||
|
runs-on: [self-hosted, hestia]
|
||||||
|
steps:
|
||||||
|
- name: checkout
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
rm -rf src && mkdir src
|
||||||
|
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
|
||||||
|
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||||
|
|
||||||
|
- name: prepare artifacts
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
|
PKG_DIR="/srv/breadway-dl/beta/bos-settings/${VERSION}"
|
||||||
|
mkdir -p "${PKG_DIR}"
|
||||||
|
cp "src/src/target/release/bos-settings" "${PKG_DIR}/bos-settings-x86_64"
|
||||||
|
strip "${PKG_DIR}/bos-settings-x86_64"
|
||||||
|
sha256sum "${PKG_DIR}/bos-settings-x86_64" | awk '{print $1}' \
|
||||||
|
> "${PKG_DIR}/bos-settings-x86_64.sha256"
|
||||||
|
cp src/packaging/bos-settings.desktop "${PKG_DIR}/"
|
||||||
|
cp src/LICENSE "${PKG_DIR}/"
|
||||||
|
cp src/bakery.toml "${PKG_DIR}/bakery.toml"
|
||||||
|
ln -sfn "${VERSION}" "/srv/breadway-dl/beta/bos-settings/latest"
|
||||||
|
|
||||||
|
# No GitHub Release upload — beta, like dev, is only distributed via
|
||||||
|
# dl.breadway.dev/beta/.
|
||||||
|
- name: regenerate beta index.json
|
||||||
|
env:
|
||||||
|
MINISIGN_SEC_KEY: ${{ secrets.BAKERY_MINISIGN_SEC_KEY_PATH }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if [ -z "${MINISIGN_SEC_KEY:-}" ]; then
|
||||||
|
echo "::error::BAKERY_MINISIGN_SEC_KEY_PATH secret not set — refusing to regenerate beta index.json unsigned (would leave a stale signature mismatched against fresh content and break bakery for everyone on the beta track)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rf /tmp/bread-ecosystem-ci-* 2>/dev/null || true
|
||||||
|
# mktemp: a fixed clone path races when multiple repos' dev/beta
|
||||||
|
# workflows run close together on the same self-hosted runner.
|
||||||
|
ECOSYSTEM_CI_DIR="$(mktemp -d /tmp/bread-ecosystem-ci-XXXXXX)"
|
||||||
|
git clone https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
||||||
|
TRACK=beta bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
||||||
|
rm -rf "${ECOSYSTEM_CI_DIR}"
|
||||||
|
|
@ -6,6 +6,7 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
if: ${{ !contains(github.ref_name, '-rc.') }}
|
||||||
runs-on: [self-hosted, hestia]
|
runs-on: [self-hosted, hestia]
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue