From 72f86f0675c475f2e0ddd68b07ad53c1a774a852 Mon Sep 17 00:00:00 2001 From: Breadway Date: Mon, 3 Aug 2026 11:43:19 +0800 Subject: [PATCH] fixed CI libadwaita version mismatch --- .forgejo/workflows/dev-release.yml | 25 +++++++++++-------------- .forgejo/workflows/rc-release.yml | 21 +++++++++++---------- .forgejo/workflows/release.yml | 13 +++++++++++-- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.forgejo/workflows/dev-release.yml b/.forgejo/workflows/dev-release.yml index ce6ea8f..358da4f 100644 --- a/.forgejo/workflows/dev-release.yml +++ b/.forgejo/workflows/dev-release.yml @@ -1,8 +1,5 @@ name: dev release -# Publishes a dev-track build on every push to `main` (the trunk -# branch — there is no separate `dev` branch). See bread-ecosystem's -# docs/release-channels.md for the release-track policy this is part of. on: push: branches: ['main'] @@ -18,18 +15,22 @@ jobs: git clone --branch main --depth 1 \ "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src - - name: build - run: cd src && cargo build --release --locked + - name: build inside container + run: | + podman run --rm \ + -v "$(pwd)/src:/workspace" \ + -w /workspace \ + fedora:41 \ + bash -c " + set -euo pipefail + dnf install -y gcc pkgconf-pkg-config libadwaita-devel cargo + 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 (seen in practice: breadbox/breadpad/breadcrumbs/ - # breadpaper), 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//' | (grep -v -- '-' || true) | sort -V | tail -1)" @@ -59,8 +60,6 @@ jobs: cp src/bakery.toml "${PKG_DIR}/bakery.toml" ln -sfn "${VERSION}" "/srv/breadway-dl/dev/breadpad/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 }} @@ -71,8 +70,6 @@ jobs: 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 main https://git.breadway.dev/Breadway/bread-ecosystem.git "${ECOSYSTEM_CI_DIR}" TRACK=dev bash "${ECOSYSTEM_CI_DIR}/scripts/gen-index.sh" diff --git a/.forgejo/workflows/rc-release.yml b/.forgejo/workflows/rc-release.yml index bd3446b..f623e30 100644 --- a/.forgejo/workflows/rc-release.yml +++ b/.forgejo/workflows/rc-release.yml @@ -1,9 +1,5 @@ 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*'] @@ -20,8 +16,17 @@ jobs: git clone --branch "${GITHUB_REF_NAME}" --depth 1 \ "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src - - name: build - run: cd src && cargo build --release --locked + - name: build inside container + run: | + podman run --rm \ + -v "$(pwd)/src:/workspace" \ + -w /workspace \ + fedora:41 \ + bash -c " + set -euo pipefail + dnf install -y gcc pkgconf-pkg-config libadwaita-devel cargo + cargo build --release --locked + " - name: prepare artifacts run: | @@ -40,8 +45,6 @@ jobs: cp src/bakery.toml "${PKG_DIR}/bakery.toml" ln -sfn "${VERSION}" "/srv/breadway-dl/beta/breadpad/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 }} @@ -52,8 +55,6 @@ jobs: 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" diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 636caaf..756504d 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -16,8 +16,17 @@ jobs: git clone --branch "${GITHUB_REF_NAME}" --depth 1 \ "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src - - name: build - run: cd src && cargo build --release --locked + - name: build inside container + run: | + podman run --rm \ + -v "$(pwd)/src:/workspace" \ + -w /workspace \ + fedora:41 \ + bash -c " + set -euo pipefail + dnf install -y gcc pkgconf-pkg-config libadwaita-devel cargo + cargo build --release --locked + " - name: prepare artifacts run: |