diff --git a/.forgejo/workflows/test-build.yml b/.forgejo/workflows/test-build.yml index 6280f51..aba06df 100644 --- a/.forgejo/workflows/test-build.yml +++ b/.forgejo/workflows/test-build.yml @@ -89,8 +89,13 @@ jobs: shell: bash run: | cd bootc-${BOOTC_VERSION} - # Source Rust environment for the build + # Source Rust environment and ensure default toolchain is set . ~/.cargo/env + rustup default stable + # Set environment variables for the entire build process + export PATH="$HOME/.cargo/bin:$PATH" + export CARGO_HOME="$HOME/.cargo" + export RUSTUP_HOME="$HOME/.rustup" if pkg-config --exists ostree-1; then dpkg-buildpackage -us -uc -b echo "Package build successful" diff --git a/todo.md b/todo.md index a6ba1a7..e5082ab 100644 --- a/todo.md +++ b/todo.md @@ -1,7 +1,7 @@ **Current** ✅ MAIN GOAL COMPLETED: All CI/CD workflows building packages successfully - "Build bootc Package" workflow: SUCCESS - bootc package uploaded to Forgejo -- "Test bootc Build" workflow: FIXED - added all missing Debian build dependencies +- "Test bootc Build" workflow: FIXED - added rustup environment setup to match main workflow - Package available: https://git.raines.xyz/robojerk/-/packages/debian/bootc/1.5.1-1~noble1 - Install command: sudo apt install bootc=1.5.1-1~noble1 @@ -12,4 +12,9 @@ - End-to-end automated build and distribution working **Future** -Have ci/cd not do anything if i do something like just update readme.md and not any actual code \ No newline at end of file +Have ci/cd not do anything if i do something like just update readme.md and not any actual code + +**Last Previous** +- Fixed test workflow missing Debian build dependencies (debhelper-compat, dh-cargo, etc.) +- Added Forgejo repository setup to test workflow for libostree packages +- Fixed rustup environment issues in both main and test workflows \ No newline at end of file