From 9e9dfebbf28dc58d5bc5d4a24c5929ea0d2698d6 Mon Sep 17 00:00:00 2001 From: robojerk Date: Mon, 21 Jul 2025 22:21:28 +0000 Subject: [PATCH] Fix rustup toolchain and glib-2.0 dependencies - Set rustup default toolchain to stable - Add libglib2.0-dev for Rust crate compatibility - Fix build dependency issues in both workflows --- .forgejo/workflows/build-packages.yml | 3 +++ .forgejo/workflows/test-build.yml | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index 0b33ff2..5572e10 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -46,6 +46,9 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y . ~/.cargo/env + # Set default toolchain for rustup + rustup default stable + # Verify Rust version rustc --version cargo --version diff --git a/.forgejo/workflows/test-build.yml b/.forgejo/workflows/test-build.yml index 96c8e03..c738cd3 100644 --- a/.forgejo/workflows/test-build.yml +++ b/.forgejo/workflows/test-build.yml @@ -27,6 +27,9 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y . ~/.cargo/env + # Set default toolchain for rustup + rustup default stable + # Verify Rust version rustc --version cargo --version @@ -38,6 +41,11 @@ jobs: cp -r /tmp/bootc-deb/* . cp -r /tmp/bootc-deb/.* . 2>/dev/null || true + - name: Install build dependencies + run: | + apt update -y + apt install -y libglib2.0-dev pkg-config + - name: Check libostree version run: | pkg-config --modversion ostree-1 || echo "libostree not found"