From ed7a2ee35f686bae61b173e3765ee808837b8108 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 2 Mar 2026 22:20:21 +0000 Subject: [PATCH 1/2] bootc: Update revdep test for current bootc main Now that bootc vendors the latest composefs-rs, we can re-sync the CI here to re-test using the bootc tests. Update the patch URL, add cfsctl to the patched crates, and pass the required arguments through to bootc's test-composefs target (defaulting to grub + ext4). Assisted-by: OpenCode (Claude claude-opus-4-6) Signed-off-by: Colin Walters --- bootc/Justfile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bootc/Justfile b/bootc/Justfile index c040ded5..3fee6816 100644 --- a/bootc/Justfile +++ b/bootc/Justfile @@ -59,8 +59,9 @@ patch: clone { echo '' echo '# Patched by composefs-rs CI to test against local composefs-rs' - echo '[patch."https://github.com/containers/composefs-rs"]' + echo '[patch."https://github.com/composefs/composefs-rs"]' echo "composefs = { path = \"$_COMPOSEFS_SRC/crates/composefs\" }" + echo "cfsctl = { path = \"$_COMPOSEFS_SRC/crates/cfsctl\" }" echo "composefs-boot = { path = \"$_COMPOSEFS_SRC/crates/composefs-boot\" }" echo "composefs-oci = { path = \"$_COMPOSEFS_SRC/crates/composefs-oci\" }" } >> Cargo.toml @@ -70,7 +71,7 @@ patch: clone sed -i 's/missing_docs = "deny"/missing_docs = "allow"/' Cargo.toml # Update Cargo.lock so the patch is recognized by cargo xtask local-rust-deps - cargo update composefs composefs-boot composefs-oci + cargo update composefs cfsctl composefs-boot composefs-oci echo "bootc patched successfully" @@ -85,12 +86,12 @@ build: patch # Run bootc composefs tests using local composefs-rs # Since the patch uses real local paths, no symlinks or special env vars needed -test: build +test bootloader="grub" filesystem="ext4": build #!/bin/bash set -euo pipefail cd "$COMPOSEFS_BOOTC_PATH" - echo "Running bootc composefs tests..." - just test-composefs + echo "Running bootc composefs tests (bootloader={{bootloader}}, filesystem={{filesystem}})..." + just test-composefs {{bootloader}} {{filesystem}} # Clean the bootc checkout and any patches clean: @@ -120,6 +121,11 @@ config: COMPOSEFS_BOOTC_REF - Override bootc git ref (branch/tag/PR) COMPOSEFS_BOOTC_REPO - Override bootc git repository + Test Parameters: + just bootc/test # Default: grub + ext4 + just bootc/test systemd ext4 # systemd-boot + ext4 + just bootc/test grub xfs # grub + xfs + Example Usage: just bootc/build # Clone main, patch, and build COMPOSEFS_BOOTC_REF=v1.2.0 just bootc/build # Use specific tag From a59c4cad0a12ea65d5d1d7d7341052d6506ed0fa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 3 Mar 2026 15:56:49 -0500 Subject: [PATCH 2/2] ci: Bump bootc CI timeout to 2h I think we were just above 1h before, let's give ourselves some headroom. (obviously it'd be nicer to make this faster) Signed-off-by: Colin Walters --- .github/workflows/bootc-revdep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bootc-revdep.yml b/.github/workflows/bootc-revdep.yml index decbf2a9..dcde0853 100644 --- a/.github/workflows/bootc-revdep.yml +++ b/.github/workflows/bootc-revdep.yml @@ -22,7 +22,7 @@ jobs: bootc-test: name: Build and test bootc with local composefs-rs runs-on: ubuntu-24.04 - timeout-minutes: 60 + timeout-minutes: 120 steps: - name: Checkout repository