From 5d38f1f47a4a3d749b777d2a2de5fac413ba9d64 Mon Sep 17 00:00:00 2001 From: robojerk Date: Mon, 21 Jul 2025 22:31:20 +0000 Subject: [PATCH] Fix rustup toolchain and zstd dependency issues - Add rustup default stable in build step for proper toolchain setup - Install libzstd-dev for zstd-sys crate compatibility - Fix rustup toolchain context issues in main workflow - Add missing zstd development libraries to both workflows - Ensure all Rust crate dependencies are available --- .forgejo/workflows/build-packages.yml | 6 ++++-- .forgejo/workflows/test-build.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index 5572e10..f66c2e7 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -149,7 +149,8 @@ jobs: libarchive-dev libfuse3-dev libsystemd-dev libmount-dev \ libselinux1-dev libavahi-client-dev libavahi-glib-dev \ libsoup-3.0-dev gobject-introspection gtk-doc-tools \ - docbook-xml docbook-xsl xsltproc gjs libglib2.0-doc + docbook-xml docbook-xsl xsltproc gjs libglib2.0-doc \ + libzstd-dev - name: Clone bootc source run: | @@ -194,8 +195,9 @@ jobs: run: | cd bootc-${BOOTC_VERSION} echo "Building bootc package with libostree compatibility patch..." - # Source Rust environment for the build + # Source Rust environment and ensure default toolchain is set . ~/.cargo/env + rustup default stable dpkg-buildpackage -us -uc -b - name: List built packages diff --git a/.forgejo/workflows/test-build.yml b/.forgejo/workflows/test-build.yml index c738cd3..6276e35 100644 --- a/.forgejo/workflows/test-build.yml +++ b/.forgejo/workflows/test-build.yml @@ -44,7 +44,7 @@ jobs: - name: Install build dependencies run: | apt update -y - apt install -y libglib2.0-dev pkg-config + apt install -y libglib2.0-dev libzstd-dev pkg-config - name: Check libostree version run: |