Skip to content

ci: A few improvements #2293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cgwalters wants to merge 3 commits into
base: main
Choose a base branch
from
Open

ci: A few improvements #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
220aa79
ci: Skip redundant package rebuild in test-container step
cgwalters Jul 2, 2026
67909ba
ci: Disable incremental compilation in CI container builds
cgwalters Jul 2, 2026
e60c83f
ci: Prune container build cache before TMT tests
cgwalters Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:

env:
CARGO_TERM_COLOR: always
# Disable incremental compilation in CI; it wastes disk in the container
# build cache (--mount=type=cache,target=/src/target) and doesn't help
# one-shot builds. Wired into container builds via Justfile --build-arg.
CARGO_INCREMENTAL: "0"
# Something seems to be setting this in the default GHA runners, which breaks bcvk
# as the default runner user doesn't have access
LIBVIRT_DEFAULT_URI: "qemu:///session"
Expand Down Expand Up @@ -307,12 +311,15 @@ jobs:
test ${{ matrix.test_os }} = "${used_vid}"

- name: Unit and container integration tests
run: just test-container
run: BOOTC_SKIP_PACKAGE=1 just test-container

- name: Validate composefs digest (UKI only)
if: matrix.boot_type == 'uki'
run: just validate-composefs-digest

- name: Reclaim disk space before TMT
run: podman builder prune -af

- name: Run TMT integration tests
run: |
if [[ "${{ matrix.variant }}" = composefs ]]; then
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ COPY contrib/packaging /
FROM $base as buildroot
# Flip this off to disable initramfs code
ARG initramfs=1
# CI passes --build-arg=CARGO_INCREMENTAL=0 to save disk in the build cache.
# When unset (local dev), cargo uses its profile defaults.
ARG CARGO_INCREMENTAL
ENV CARGO_INCREMENTAL=${CARGO_INCREMENTAL}
# This installs our buildroot, and we want to cache it independently of the rest.
# Basically we don't want changing a .rs file to blow out the cache of packages.
# Use tmpfs for /run and /tmp with bind mounts inside to avoid leaking mount stubs into the image
Expand Down
3 changes: 3 additions & 0 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ fedora-coreos := "quay.io/fedora/fedora-coreos:testing-devel"
generic_buildargs := ""
_extra_src_args := if extra_src != "" { "-v " + extra_src + ":/run/extra-src:ro --security-opt=label=disable" } else { "" }
# filesystem arg: required for bootc container ukify to allow missing fsverity
# CARGO_INCREMENTAL is passed through as-is (CI sets it to 0); empty is a no-op,
# leaving cargo's own profile defaults in effect in the Dockerfile.
base_buildargs := generic_buildargs + " " + _extra_src_args \
+ " --build-arg=CARGO_INCREMENTAL=" + env("CARGO_INCREMENTAL", "") \
+ " --build-arg=base=" + base \
+ " --build-arg=variant=" + variant \
+ " --build-arg=bootloader=" + bootloader \
Expand Down
Loading