Drop pacman packaging, bakery-only; fix broken Tauri build path in CI
bakery.toml gains license_file/desktop_file (closing the same gap found
across the rest of the ecosystem) plus hicolor-icon-theme as an optional
dep. Removes packaging/PKGBUILD and .forgejo/workflows/package.yml.
Also fixes release.yml, which has never actually succeeded since the
GTK4->Tauri migration (93c3b88): Cargo.toml moved to src/src/Cargo.toml
(the checkout dir is conventionally named "src", and this repo's own
Rust backend directory is *also* named "src", not the usual src-tauri),
and the Rust build needs frontend/build to already exist (tauri.conf.json's
frontendDist) — that's normally handled by `cargo tauri build`'s
beforeBuildCommand hook, which a plain `cargo build` never runs, so it's
now a separate explicit "build frontend" step. Adds dev-release.yml/
beta-release.yml for the same three-track policy used ecosystem-wide.
This commit is contained in:
Breadway
parent
f5d70476f0
commit
b1429784a7
8 changed files with 219 additions and 111 deletions
92
.forgejo/workflows/beta-release.yml
Normal file
92
.forgejo/workflows/beta-release.yml
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
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}"
|
||||
92
.forgejo/workflows/dev-release.yml
Normal file
92
.forgejo/workflows/dev-release.yml
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
name: dev release
|
||||
|
||||
# Publishes a dev-track build on every push to `dev` —
|
||||
# separate from release.yml's tag-triggered stable releases. See
|
||||
# bread-ecosystem's docs/release-channels.md for the three-track policy
|
||||
# this is part of.
|
||||
on:
|
||||
push:
|
||||
branches: ['dev']
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: [self-hosted, hestia]
|
||||
steps:
|
||||
- name: checkout
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf src && mkdir src
|
||||
git clone --branch dev --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 dev version
|
||||
run: |
|
||||
set -euo pipefail
|
||||
cd src
|
||||
# Base the dev 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 dev 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))-dev.${TS}+${SHA}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
set -euo pipefail
|
||||
PKG_DIR="/srv/breadway-dl/dev/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/dev/bos-settings/latest"
|
||||
|
||||
# No GitHub Release upload — dev, like the other non-stable track,
|
||||
# is only distributed via dl.breadway.dev/dev/.
|
||||
- name: regenerate dev 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 dev index.json unsigned (would leave a stale signature mismatched against fresh content and break bakery for everyone on the dev 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 --branch dev https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
||||
TRACK=dev bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
||||
rm -rf "${ECOSYSTEM_CI_DIR}"
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
name: Build and publish package
|
||||
|
||||
on:
|
||||
push:
|
||||
tags: ['v*']
|
||||
|
||||
jobs:
|
||||
package:
|
||||
runs-on: [self-hosted, hestia]
|
||||
container:
|
||||
image: archlinux:latest
|
||||
steps:
|
||||
# Note: no actions/checkout — the archlinux image has no Node, which JS
|
||||
# actions require. Everything runs as shell steps and clones manually.
|
||||
- name: Build and publish
|
||||
env:
|
||||
PUBLISH_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
pacman -Syu --noconfirm base-devel git rust cargo gtk4 glib2
|
||||
useradd -m builder
|
||||
git config --global --add safe.directory '*'
|
||||
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
|
||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" /home/builder/src
|
||||
cd /home/builder/src
|
||||
git archive --format=tar.gz --prefix="bos-settings-${VERSION}/" HEAD \
|
||||
> packaging/bos-settings-${VERSION}.tar.gz
|
||||
SHA=$(sha256sum packaging/bos-settings-${VERSION}.tar.gz | awk '{print $1}')
|
||||
sed -i "s/^pkgver=.*/pkgver=${VERSION}/" packaging/PKGBUILD
|
||||
sed -i "s/^sha256sums=.*/sha256sums=('${SHA}')/" packaging/PKGBUILD
|
||||
chown -R builder:builder /home/builder/src
|
||||
# --nocheck: packaging builds the artifact; tests belong in a CI job.
|
||||
su builder -c "cd /home/builder/src/packaging && makepkg -f --noconfirm --nocheck"
|
||||
PKG=$(find /home/builder/src/packaging -name '*.pkg.tar.zst' | head -1)
|
||||
curl -fsS -X PUT \
|
||||
-H "Authorization: token ${PUBLISH_TOKEN}" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary "@${PKG}" \
|
||||
"https://git.breadway.dev/api/packages/Breadway/arch/os"
|
||||
|
|
@ -15,8 +15,23 @@ jobs:
|
|||
git clone --branch "${GITHUB_REF_NAME}" --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 && cargo build --release --locked
|
||||
run: cd src/src && cargo build --release --locked
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
|
|
@ -24,19 +39,29 @@ jobs:
|
|||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_DIR="/srv/breadway-dl/bos-settings/${VERSION}"
|
||||
mkdir -p "${PKG_DIR}"
|
||||
cp "src/target/release/bos-settings" "${PKG_DIR}/bos-settings-x86_64"
|
||||
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/bos-settings/latest"
|
||||
|
||||
- name: regenerate index.json
|
||||
env:
|
||||
MINISIGN_SEC_KEY: ${{ secrets.BAKERY_MINISIGN_SEC_KEY_PATH }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf /tmp/bread-ecosystem-ci
|
||||
git clone https://git.breadway.dev/Breadway/bread-ecosystem.git /tmp/bread-ecosystem-ci
|
||||
bash /tmp/bread-ecosystem-ci/scripts/gen-index.sh
|
||||
if [ -z "${MINISIGN_SEC_KEY:-}" ]; then
|
||||
echo "::error::BAKERY_MINISIGN_SEC_KEY_PATH secret not set — refusing to regenerate index.json unsigned (would leave a stale signature mismatched against fresh content and break bakery for everyone)"
|
||||
exit 1
|
||||
fi
|
||||
rm -rf /tmp/bread-ecosystem-ci-* 2>/dev/null || true
|
||||
ECOSYSTEM_CI_DIR="$(mktemp -d /tmp/bread-ecosystem-ci-XXXXXX)"
|
||||
git clone https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}"
|
||||
bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh"
|
||||
rm -rf "${ECOSYSTEM_CI_DIR}"
|
||||
|
||||
- name: upload to GitHub Release
|
||||
env:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue