From 712789a75cc5440dbb7ec5e7d289c1739fcd2f13 Mon Sep 17 00:00:00 2001
From: Alejandro R Mosteo <alejandro@mosteo.com>
Date: Mon, 20 Sep 2021 15:47:15 +0200
Subject: [PATCH] Switch to setup-alire@v1 (#363)

* Switch to setup-alire@v1

* Code review
---
 .github/workflows/build-crate.yml  | 19 +++++++++----------
 .github/workflows/build-native.yml | 16 +++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml
index b81f33d2..731705f1 100644
--- a/.github/workflows/build-crate.yml
+++ b/.github/workflows/build-crate.yml
@@ -14,15 +14,15 @@ jobs:
 
     strategy:
       matrix:
-        os: 
+        os:
           - macos-latest
           - ubuntu-latest
           - windows-latest
         tag:
           - arch-rolling
           - centos-latest-community-latest
-          - community-current          
-          - debian-stable          
+          - community-current
+          - debian-stable
           - ubuntu-lts
           - ""
         exclude: # inclusions don't allow to add arrays of values to a scenario
@@ -73,13 +73,16 @@ jobs:
 
     - name: Set up stable `alr`
       if: contains(github.base_ref, 'stable-')
-      uses: alire-project/setup-alire@latest-stable
+      uses: alire-project/setup-alire@v1
+      with:
+        toolchain: --disable-assistant # We want to use the external ones in this workflow
 
     - name: Set up devel `alr`
       if: contains(github.base_ref, 'devel-')
-      uses: alire-project/setup-alire@latest-devel
+      uses: alire-project/setup-alire@v1
       with:
-        toolchain: --disable-assistant # We want to use the external ones
+        toolchain: --disable-assistant # We want to use the external ones in this workflow
+        branch: master
 
     - name: Test crate (Linux)
       if: matrix.os == 'ubuntu-latest' # docker testing only for linuxes
@@ -89,10 +92,6 @@ jobs:
         command: scripts/gh-build-crate.sh
         params: -v ${{ github.workspace }}/alire_install/bin/alr:/usr/bin/alr
 
-    - name: Set up msys2 (Windows)
-      if: matrix.os == 'windows-latest'
-      run: ./alire_install/bin/alr --non-interactive version
-
     - 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
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
index f1efe1db..a004cdb0 100644
--- a/.github/workflows/build-native.yml
+++ b/.github/workflows/build-native.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        os: 
+        os:
           - macos-latest
           - ubuntu-latest
           - windows-latest
@@ -31,8 +31,8 @@ jobs:
         # check-author action).
 
     # For the devel branch we need a compiler available to build alr in
-    # setup-alire. At some point we should integrate this in the
-    # setup-alire@latest-devel action.
+    # setup-alire. We will be able to get rid of this once composite actions
+    # support conditional steps.
 
     - name: Set up GNAT toolchain (FSF)
       if: (matrix.os == 'ubuntu-latest') && (contains(github.base_ref, 'devel-'))
@@ -49,16 +49,14 @@ jobs:
     # By default, this sets up the newest indexed native toolchain
     - name: Set up stable `alr`
       if: contains(github.base_ref, 'stable-')
-      uses: alire-project/setup-alire@latest-stable
+      uses: alire-project/setup-alire@v1
 
     # By default, this sets up the newest indexed native toolchain
     - name: Set up devel `alr`
       if: contains(github.base_ref, 'devel-')
-      uses: alire-project/setup-alire@latest-devel
-
-    - name: Set up msys2 (Windows)
-      if: matrix.os == 'windows-latest'
-      run: ./alire_install/bin/alr --non-interactive version
+      uses: alire-project/setup-alire@v1
+      with:
+        branch: 'master'
 
     - name: Install tar from msys2 (Windows) # Git tar in Actions VM does not seem to work)
       if: matrix.os == 'windows-latest'