Enable installation in aarch64 archs

alire-project · Oct 12, 2024 · 01315b9 · 01315b9
1 parent 008834e
commit 01315b9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/.github/workflows/selftest.yml b/.github/workflows/selftest.yml
@@ -4,27 +4,36 @@ on: pull_request
 
 jobs:
   alr-install:
+    name: Selftest (${{ matrix.os }}, cache=${{ matrix.cached }})
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        cached: [false, true]
+        os:
+          - macos-12
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+        cached:
+          - false
+          - true
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Selftest
         uses: ./ # Uses the action code from the PR itself
         with:
-          crates: gprbuild
-          # This can be changed to a more lightweight crate (hello)
-          # once we can install indexed releases.
+          # One binary and one source crate. We could use a lighter binary
+          # crate prepared to this effect... TODO.
+          crates: gprbuild hello
           cache: ${{ matrix.cached }}
 
       - name: Run check
         shell: bash
         run: |
-          which gprbuild
-          gprbuild --version
+          which gprbuild && \
+          gprbuild --version && \
+          hello | grep "Hello, world!"
diff --git a/action.yml b/action.yml
@@ -40,10 +40,16 @@ runs:
 
     - name: Set up alr
       if: steps.find-alr.outputs.available != 'true'
-      uses: alire-project/setup-alire@v3
+      uses: alire-project/setup-alire@v4
       with:
         cache: ${{inputs.cache}}
 
+    - name: Prepare alr version
+      id: alr-version
+      shell: bash
+      run: |
+        echo "version=$(alr --version)" >> $GITHUB_OUTPUT
+
     - name: Prepare --force
       id: force
       shell: bash
@@ -69,7 +75,7 @@ runs:
       id: cache-key
       shell: bash
       run: |
-        echo "key=[alr-install][${{runner.os}}][${{runner.arch}}][${{inputs.prefix}}][${{steps.find-versions.outputs.milestones}}]" >> $GITHUB_OUTPUT
+        echo "key=[1][alr-install][alr=${{steps.alr-version.outputs.version}}][${{runner.os}}][${{runner.arch}}][${{inputs.prefix}}][${{steps.find-versions.outputs.milestones}}]" >> $GITHUB_OUTPUT
 
     - name: Reuse cached installation
       if: inputs.cache == 'true'