CI: replace from-source libadwaita build with pinned Arch container
Some checks failed
check / check (push) Failing after 1m57s
Some checks failed
check / check (push) Failing after 1m57s
The dev/rc/release workflows rebuilt libadwaita from source inside an uncached Fedora container on every single run, because Ubuntu 24.04's packaged libadwaita was too old for gtk4 0.11's v4_12 feature. That from-source build broke repeatedly on drift (rust dep versions, libadwaita ABI, and finally a removed meson option), producing eight straight failed CI runs. Arch's repos already carry current gtk4/libadwaita/gtk4-layer-shell as prebuilt packages, and breadpad only targets BOS/Arch, so there's no reason to build anything from source. Swap the container base to a digest-pinned archlinux image (ci/Containerfile) with those packages installed via pacman, and extract the shared "build the image, run cargo inside it" logic into ci/build.sh so it isn't duplicated three times across the workflows. Cargo's registry/git/target caches persist in named docker volumes across runs. Also: - Add check.yml: clippy + test on feature/**/fix/** pushes, so lint/ build breakage surfaces before it reaches main and triggers a dev-track release. - Fix release.yml's tag trigger (tags-ignore) so an rc tag push no longer also spawns a skipped release.yml run alongside rc-release.yml. Verified locally: the container builds cleanly via pacman (no source compilation), and `cargo build --release --locked --workspace` inside it produces working breadpad/breadman binaries linked against libgtk4-layer-shell.so.0 and libadwaita-1.so.0 respectively.
This commit is contained in:
parent
2b5ad272a5
commit
3225f49a93
7 changed files with 99 additions and 72 deletions
24
.forgejo/workflows/check.yml
Normal file
24
.forgejo/workflows/check.yml
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
name: check
|
||||
|
||||
# Fast-fail lint/test on short-lived work branches, before it ever reaches
|
||||
# main and triggers a dev-track release build.
|
||||
on:
|
||||
push:
|
||||
branches: ['feature/**', 'fix/**']
|
||||
|
||||
jobs:
|
||||
check:
|
||||
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: clippy
|
||||
run: cd src && bash ci/build.sh cargo clippy --workspace --all-targets --locked -- -D warnings
|
||||
|
||||
- name: test
|
||||
run: cd src && bash ci/build.sh cargo test --workspace --locked
|
||||
|
|
@ -15,27 +15,8 @@ jobs:
|
|||
git clone --branch main --depth 1 \
|
||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||
|
||||
- name: build inside container
|
||||
run: |
|
||||
docker run --rm \
|
||||
-v "$(pwd)/src:/workspace" \
|
||||
-w /workspace \
|
||||
fedora:41 \
|
||||
bash -c "
|
||||
set -euo pipefail
|
||||
dnf install -y gcc gcc-c++ pkgconf-pkg-config git curl meson ninja-build valac gtk4-devel graphene-devel
|
||||
|
||||
# Build Libadwaita 1.7.0 from source inside container (skipping tests & docs)
|
||||
git clone https://gitlab.gnome.org/GNOME/libadwaita.git --branch 1.7.0 --depth 1 /tmp/libadwaita
|
||||
meson setup /tmp/libadwaita/build /tmp/libadwaita --prefix=/usr -Dtests=false -Ddoc=false
|
||||
ninja -C /tmp/libadwaita/build
|
||||
ninja -C /tmp/libadwaita/build install
|
||||
|
||||
# Install Rust and build
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
|
||||
source \$HOME/.cargo/env
|
||||
cargo build --release --locked
|
||||
"
|
||||
- name: build
|
||||
run: cd src && bash ci/build.sh cargo build --release --locked
|
||||
|
||||
- name: compute dev version
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@ name: beta (rc) release
|
|||
|
||||
on:
|
||||
push:
|
||||
tags: ['v*']
|
||||
tags: ['v*-rc.*']
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: ${{ contains(github.ref_name, '-rc.') }}
|
||||
runs-on: [self-hosted, hestia]
|
||||
steps:
|
||||
- name: checkout
|
||||
|
|
@ -16,27 +15,8 @@ jobs:
|
|||
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
|
||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||
|
||||
- name: build inside container
|
||||
run: |
|
||||
docker run --rm \
|
||||
-v "$(pwd)/src:/workspace" \
|
||||
-w /workspace \
|
||||
fedora:41 \
|
||||
bash -c "
|
||||
set -euo pipefail
|
||||
dnf install -y gcc gcc-c++ pkgconf-pkg-config git curl meson ninja-build valac gtk4-devel graphene-devel
|
||||
|
||||
# Build Libadwaita 1.7.0 from source inside container (skipping tests & docs)
|
||||
git clone https://gitlab.gnome.org/GNOME/libadwaita.git --branch 1.7.0 --depth 1 /tmp/libadwaita
|
||||
meson setup /tmp/libadwaita/build /tmp/libadwaita --prefix=/usr -Dtests=false -Ddoc=false
|
||||
ninja -C /tmp/libadwaita/build
|
||||
ninja -C /tmp/libadwaita/build install
|
||||
|
||||
# Install Rust and build
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
|
||||
source \$HOME/.cargo/env
|
||||
cargo build --release --locked
|
||||
"
|
||||
- name: build
|
||||
run: cd src && bash ci/build.sh cargo build --release --locked
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ name: release
|
|||
|
||||
on:
|
||||
push:
|
||||
tags: ["v*"]
|
||||
tags: ['v*']
|
||||
tags-ignore: ['v*-rc.*']
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: ${{ !contains(github.ref_name, '-rc.') }}
|
||||
runs-on: [self-hosted, hestia]
|
||||
steps:
|
||||
- name: checkout
|
||||
|
|
@ -16,27 +16,8 @@ jobs:
|
|||
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
|
||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||
|
||||
- name: build inside container
|
||||
run: |
|
||||
docker run --rm \
|
||||
-v "$(pwd)/src:/workspace" \
|
||||
-w /workspace \
|
||||
fedora:41 \
|
||||
bash -c "
|
||||
set -euo pipefail
|
||||
dnf install -y gcc gcc-c++ pkgconf-pkg-config git curl meson ninja-build valac gtk4-devel graphene-devel
|
||||
|
||||
# Build Libadwaita 1.7.0 from source inside container (skipping tests & docs)
|
||||
git clone https://gitlab.gnome.org/GNOME/libadwaita.git --branch 1.7.0 --depth 1 /tmp/libadwaita
|
||||
meson setup /tmp/libadwaita/build /tmp/libadwaita --prefix=/usr -Dtests=false -Ddoc=false
|
||||
ninja -C /tmp/libadwaita/build
|
||||
ninja -C /tmp/libadwaita/build install
|
||||
|
||||
# Install Rust and build
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
|
||||
source \$HOME/.cargo/env
|
||||
cargo build --release --locked
|
||||
"
|
||||
- name: build
|
||||
run: cd src && bash ci/build.sh cargo build --release --locked
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -69,13 +69,21 @@ cargo test --release --workspace
|
|||
|
||||
## CI
|
||||
|
||||
- `check.yml` — clippy + test, triggered on push to `feature/**`/`fix/**`.
|
||||
Fast-fail before anything reaches `main`.
|
||||
- `dev-release.yml` — triggered on push to `main`.
|
||||
- `rc-release.yml` — triggered on any `vX.Y.Z-rc.N` tag push.
|
||||
- `release.yml` — triggered on any other `v*` tag push, cuts the actual
|
||||
stable release.
|
||||
|
||||
All CI runs on a self-hosted runner; nothing runs automatically on plain
|
||||
commits or PRs beyond the track builds above. See
|
||||
All of these build inside a pinned Arch Linux container (`ci/Containerfile`,
|
||||
run via `ci/build.sh`) on a self-hosted runner — not the runner host's
|
||||
native environment. Arch's repos carry current `gtk4`/`libadwaita`/
|
||||
`gtk4-layer-shell` as prebuilt packages, so there's no from-source library
|
||||
build to go stale. The image is rebuilt (and re-cached by Docker) only when
|
||||
`ci/Containerfile` changes, so a plain push doesn't refetch or recompile
|
||||
the toolchain. Nothing runs automatically on plain commits or PRs beyond
|
||||
the jobs listed above. See
|
||||
[bread-ecosystem's docs/release-channels.md](https://git.breadway.dev/Breadway/bread-ecosystem/src/branch/main/docs/release-channels.md)
|
||||
for the full policy, including how a new product gets wired onto these tracks.
|
||||
|
||||
|
|
|
|||
22
ci/Containerfile
Normal file
22
ci/Containerfile
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# Pinned CI build environment for breadpad.
|
||||
#
|
||||
# Arch instead of Fedora because breadpad targets BOS/Arch only, and Arch's
|
||||
# repos already carry current libadwaita/gtk4/gtk4-layer-shell as prebuilt
|
||||
# packages — no from-source libadwaita build needed (that from-source build
|
||||
# was the repeated CI breakage: rust dep mismatches, libadwaita ABI
|
||||
# mismatches, and finally a removed meson option).
|
||||
#
|
||||
# Base image pinned by digest, package set frozen at build time: this image
|
||||
# only changes when someone deliberately rebuilds it, not on every push.
|
||||
FROM archlinux@sha256:fae033b815a16f930325c2697e620362be4d2e5d739a301b10ad1fc9c8643a06
|
||||
|
||||
RUN pacman -Syu --noconfirm --needed \
|
||||
base-devel \
|
||||
git \
|
||||
pkgconf \
|
||||
rust \
|
||||
gtk4 \
|
||||
libadwaita \
|
||||
gtk4-layer-shell \
|
||||
graphene \
|
||||
&& pacman -Scc --noconfirm
|
||||
31
ci/build.sh
Executable file
31
ci/build.sh
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
#!/usr/bin/env bash
|
||||
# Builds (or reuses, via docker's own layer cache) the pinned Arch CI image
|
||||
# from ci/Containerfile, then runs the given cargo command inside it against
|
||||
# this repo checkout.
|
||||
#
|
||||
# Cargo's registry/git caches and CARGO_TARGET_DIR are persisted in named
|
||||
# docker volumes so they survive across runs even though the repo checkout
|
||||
# itself (a fresh --depth 1 clone per workflow run) does not.
|
||||
#
|
||||
# Usage: ci/build.sh cargo build --release --locked
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
docker build -t breadpad-ci:archlinux -f ci/Containerfile ci
|
||||
|
||||
docker run --rm \
|
||||
-v "${ROOT}:/workspace" \
|
||||
-v breadpad-cargo-registry:/root/.cargo/registry \
|
||||
-v breadpad-cargo-git:/root/.cargo/git \
|
||||
-v breadpad-cargo-target:/cargo-target \
|
||||
-w /workspace \
|
||||
-e CARGO_TARGET_DIR=/cargo-target \
|
||||
breadpad-ci:archlinux \
|
||||
bash -c '
|
||||
set -euo pipefail
|
||||
"$@"
|
||||
mkdir -p /workspace/target
|
||||
cp -a /cargo-target/. /workspace/target/
|
||||
' bash "$@"
|
||||
Loading…
Add table
Add a link
Reference in a new issue