From 40ca7100f99a9cdfbcdaf49a0a677f8a9438cffb Mon Sep 17 00:00:00 2001 From: robojerk Date: Mon, 21 Jul 2025 22:03:16 +0000 Subject: [PATCH] Fixed shell bash stuff around rust --- .forgejo/workflows/build-packages.yml | 6 ++++-- .forgejo/workflows/test-build.yml | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index 0d1798b..a7e192a 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -34,13 +34,14 @@ jobs: image: ubuntu:latest steps: - name: Setup build environment + shell: bash run: | apt update -y apt install -y git curl pkg-config build-essential gnupg # Install Rust using rustup to get the latest version curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source ~/.cargo/env + . ~/.cargo/env # Verify Rust version rustc --version @@ -182,11 +183,12 @@ jobs: cp -r ../debian . - name: Build bootc package + shell: bash run: | cd bootc-${BOOTC_VERSION} echo "Building bootc package with libostree compatibility patch..." # Source Rust environment for the build - source ~/.cargo/env + . ~/.cargo/env dpkg-buildpackage -us -uc -b - name: List built packages diff --git a/.forgejo/workflows/test-build.yml b/.forgejo/workflows/test-build.yml index 929ebd9..96c8e03 100644 --- a/.forgejo/workflows/test-build.yml +++ b/.forgejo/workflows/test-build.yml @@ -18,13 +18,14 @@ jobs: image: ubuntu:latest steps: - name: Setup build environment + shell: bash run: | apt update -y apt install -y git curl pkg-config build-essential # Install Rust using rustup to get the latest version curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source ~/.cargo/env + . ~/.cargo/env # Verify Rust version rustc --version @@ -58,17 +59,19 @@ jobs: cp -r ../debian . - name: Test cargo build + shell: bash run: | cd bootc-${BOOTC_VERSION} # Source Rust environment for the build - source ~/.cargo/env + . ~/.cargo/env cargo build --release - name: Test package build (if libostree available) + shell: bash run: | cd bootc-${BOOTC_VERSION} # Source Rust environment for the build - source ~/.cargo/env + . ~/.cargo/env if pkg-config --exists ostree-1; then dpkg-buildpackage -us -uc -b echo "Package build successful"