Skip to content

bootc: Update revdep test for current bootc main #242

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 2 commits into
base: main
Choose a base branch
from
Open

bootc: Update revdep test for current bootc main #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed7a2ee
bootc: Update revdep test for current bootc main
cgwalters Mar 2, 2026
a59c4ca
ci: Bump bootc CI timeout to 2h
cgwalters Mar 3, 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
2 changes: 1 addition & 1 deletion .github/workflows/bootc-revdep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 11 additions & 5 deletions bootc/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading