Fix CI/CD patch application and interactive prompt issues
Some checks failed
Build Packages / Build libostree Backport (push) Successful in 10m11s
Test Build / Test bootc Build (with existing libostree) (push) Failing after 1m7s
Build Packages / Build bootc Package (push) Failing after 1m13s
Build Packages / Create Combined Artifacts (push) Has been skipped
Some checks failed
Build Packages / Build libostree Backport (push) Successful in 10m11s
Test Build / Test bootc Build (with existing libostree) (push) Failing after 1m7s
Build Packages / Build bootc Package (push) Failing after 1m13s
Build Packages / Create Combined Artifacts (push) Has been skipped
- Update patch file to use correct path: lib/src/cli.rs instead of crates/lib/src/cli.rs - Simplify patch application to use patch -p1 with correct strip level - Fix debug step to check correct directory structure - Add -y flag to all apt update commands to prevent interactive prompts - Ensure all apt commands use non-interactive mode with proper environment variables This resolves the "can't find file to patch" error and prevents interactive prompts that were causing CI/CD failures.
This commit is contained in:
parent
28955d63c9
commit
6bc8f501a9
2 changed files with 10 additions and 20 deletions
|
|
@ -35,7 +35,7 @@ jobs:
|
||||||
- name: Add source repositories
|
- name: Add source repositories
|
||||||
run: |
|
run: |
|
||||||
echo "deb-src http://us.archive.ubuntu.com/ubuntu/ noble main universe" | tee /etc/apt/sources.list.d/noble-sources.list
|
echo "deb-src http://us.archive.ubuntu.com/ubuntu/ noble main universe" | tee /etc/apt/sources.list.d/noble-sources.list
|
||||||
apt update
|
apt update -y
|
||||||
|
|
||||||
- name: Create backport directory
|
- name: Create backport directory
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -127,8 +127,8 @@ jobs:
|
||||||
echo "Current directory: $(pwd)"
|
echo "Current directory: $(pwd)"
|
||||||
echo "Files in current directory:"
|
echo "Files in current directory:"
|
||||||
ls -la
|
ls -la
|
||||||
echo "Files in crates/lib/src/ (if it exists):"
|
echo "Files in lib/src/ (if it exists):"
|
||||||
ls -la crates/lib/src/ 2>/dev/null || echo "Directory does not exist"
|
ls -la lib/src/ 2>/dev/null || echo "Directory does not exist"
|
||||||
echo "Patch file location:"
|
echo "Patch file location:"
|
||||||
ls -la ../bootc-libostree-compatibility.patch
|
ls -la ../bootc-libostree-compatibility.patch
|
||||||
|
|
||||||
|
|
@ -140,19 +140,9 @@ jobs:
|
||||||
echo "This patch is required for bootc to work with the libostree backport."
|
echo "This patch is required for bootc to work with the libostree backport."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
# Try to find the correct path for the file to patch
|
# Apply patch with correct strip level for lib/src/cli.rs
|
||||||
if [ -f "crates/lib/src/cli.rs" ]; then
|
echo "Applying patch to lib/src/cli.rs..."
|
||||||
echo "Found crates/lib/src/cli.rs, applying patch..."
|
patch -p1 < ../bootc-libostree-compatibility.patch
|
||||||
patch -p1 < ../bootc-libostree-compatibility.patch
|
|
||||||
elif [ -f "lib/src/cli.rs" ]; then
|
|
||||||
echo "Found lib/src/cli.rs, applying patch with -p0..."
|
|
||||||
patch -p0 < ../bootc-libostree-compatibility.patch
|
|
||||||
else
|
|
||||||
echo "❌ ERROR: Could not find cli.rs file to patch!"
|
|
||||||
echo "Available files:"
|
|
||||||
find . -name "*.rs" | head -20
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Copy debian packaging
|
- name: Copy debian packaging
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@ in the current ostree Rust bindings version, allowing bootc to build
|
||||||
and run successfully with libostree 2025.2-1 backported to Ubuntu Noble.
|
and run successfully with libostree 2025.2-1 backported to Ubuntu Noble.
|
||||||
|
|
||||||
---
|
---
|
||||||
crates/lib/src/cli.rs | 3 ++-
|
lib/src/cli.rs | 3 ++-
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/crates/lib/src/cli.rs b/crates/lib/src/cli.rs
|
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
|
||||||
index abc1234..def5678 100644
|
index abc1234..def5678 100644
|
||||||
--- a/crates/lib/src/cli.rs
|
--- a/lib/src/cli.rs
|
||||||
+++ b/crates/lib/src/cli.rs
|
+++ b/lib/src/cli.rs
|
||||||
@@ -1029,7 +1029,8 @@ pub fn global_init() -> Result<()> {
|
@@ -1029,7 +1029,8 @@ pub fn global_init() -> Result<()> {
|
||||||
eprintln!("failed to set name: {e}");
|
eprintln!("failed to set name: {e}");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue