From 19787961bbf06c61a3d632424b49f2773fc1c7d1 Mon Sep 17 00:00:00 2001
From: "Silvio Tomatis (aider)" <silviot@gmail.com>
Date: Sun, 8 Dec 2024 11:53:51 +0100
Subject: [PATCH] feat: Add Rust installation and configuration for MSYS2 in
 build workflow

---
 .github/workflows/build.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ae7ca8..5b6a10d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -308,9 +308,20 @@ jobs:
           pacman -S --noconfirm mingw-w64-ucrt-x86_64-gtk4
           echo "PKG_CONFIG_PATH=/ucrt64/lib/pkgconfig" >> $GITHUB_ENV
           echo "PKG_CONFIG_LIBDIR=/ucrt64/lib/pkgconfig" >> $GITHUB_ENV
+      - name: Install Rust in MSYS2
+        shell: msys2 {0}
+        run: |
+          pacman -S --noconfirm mingw-w64-ucrt-x86_64-rust
+          # Verify rust installation
+          rustc --version
+          cargo --version
+
       - name: Build
         shell: msys2 {0}
-        run: cargo build --release
+        run: |
+          # Ensure we're using MSYS2's cargo
+          export PATH="/ucrt64/bin:$PATH"
+          cargo build --release
       - name: Package
         run: |
           mkdir aardvark-${{ matrix.arch }}