From e5919c482a457091c24750ce48db6a3cfb2aeca6 Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Fri, 15 Mar 2024 10:48:24 +0100
Subject: [PATCH] Fix: update workflow for new cache location

---
 .github/workflows/build-native-master.yml | 3 ++-
 .github/workflows/build-native.yml        | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-native-master.yml b/.github/workflows/build-native-master.yml
index 93864dcb..26a48716 100644
--- a/.github/workflows/build-native-master.yml
+++ b/.github/workflows/build-native-master.yml
@@ -10,6 +10,7 @@ name: Build Crate (alr dev)
 env:
   CHECKS_ORG: alire-project
   CHECKS_REPO: alire-index-checks
+  PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman
 
 on:
   pull_request:
@@ -55,7 +56,7 @@ jobs:
 
     - name: Install tar from msys2 (Windows) # Git tar in Actions VM does not seem to work)
       if: matrix.os == 'windows-latest'
-      run: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman --noconfirm -S tar
+      run: ${{env.PACMAN}} --noconfirm -S tar
 
     - name: Test crate
       run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
index d7fa3332..621df626 100644
--- a/.github/workflows/build-native.yml
+++ b/.github/workflows/build-native.yml
@@ -7,6 +7,7 @@ env:
   CHECKS_ORG: alire-project
   CHECKS_REPO: alire-index-checks
   ALR_VERSION: 2.0.0
+  PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman
 
 on:
   pull_request:
@@ -48,20 +49,20 @@ jobs:
     # By default, this also sets up the newest indexed native toolchain
     - name: Set up stable `alr`
       if: contains(github.base_ref, 'stable-')
-      uses: alire-project/setup-alire@v2
+      uses: alire-project/setup-alire@v3
       with:
         version: ${{env.ALR_VERSION}}
 
     # By default, this also sets up the newest indexed native toolchain
     - name: Set up devel `alr`
       if: contains(github.base_ref, 'devel-')
-      uses: alire-project/setup-alire@v2
+      uses: alire-project/setup-alire@v3
       with:
         branch: 'master'
 
     - name: Install tar from msys2 (Windows) # Git tar in Actions VM does not seem to work)
       if: matrix.os == 'windows-latest'
-      run: C:\Users\runneradmin\.cache\alire\msys64\usr\bin\pacman --noconfirm -S tar
+      run: ${{env.PACMAN}} --noconfirm -S tar
 
     - name: Test crate
       run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh