Merge remote branch 'origin/master' into edge

(no-precommit-check no-tn-check)

Author: mergerepo

.github/workflows/build-binaries.sh

@@ -18,6 +18,8 @@ $PWD/subprojects/stubs
 export CPATH=/usr/local/include:/mingw64/include
 export LIBRARY_PATH=/usr/local/lib:/mingw64/lib
 export DYLD_LIBRARY_PATH=/usr/local/lib
+export PATH=`ls -d $PWD/cached_gnat/*/bin |tr '\n' ':'`$PATH
+echo PATH=$PATH
 
 BRANCH=master
 
@@ -36,9 +38,6 @@ FILE=libadalang-$RUNNER_OS-$BRANCH${DEBUG:+-dbg}-static.tar.gz
 aws s3 cp s3://adacore-gha-tray-eu-west-1/libadalang/$FILE . --sse=AES256
 tar xzf $FILE -C $prefix
 rm -f -v $FILE
-gprinstall --uninstall gnatcoll || true
-gprinstall --uninstall gpr || true
-rm -f -v gnat/spawn*.gpr
 
 which python
 pip install --user e3-testsuite

.github/workflows/build-binaries.yml

@@ -63,27 +63,27 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ./cached_gnat
-          key: ${{ runner.os }}-gnat-ce-2021
-          restore-keys: ${{ runner.os }}-gnat-ce-2021
-      - name: Get GNAT Community 2021 toolchain
-        if: ${{ runner.os != 'macOS' }}
-        uses: ada-actions/toolchain@ce2021
-        with:
-          distrib: community
-          install_dir: ./cached_gnat
-      - name: Get GNAT Community 2020 toolchain
-        if: ${{ runner.os == 'macOS' }}
-        uses: ada-actions/toolchain@ce2020
+          key: ${{ runner.os }}-alire-2021
+          restore-keys: ${{ runner.os }}-alire-2021
+      - name: Rename gnat/
+        if: ${{ runner.os == 'Windows' }}
+        shell: bash
+        run: mv gnat gnat_
+        # alr fails to run `gnat` on Windows if there is a dir
+      - name: Get GNAT toolchain with alire
+        uses: alire-project/setup-alire@v1
         with:
-          distrib: community
-          install_dir: ./cached_gnat
+          toolchain: gnat_native^11 gprbuild^21
+          toolchain_dir: ./cached_gnat
       - name: Build (Windows)
         if: ${{ runner.os == 'Windows' }}
         shell: msys2 {0}
         env:
           AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
           AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
         run: |
+          # Move `gnat` back
+          mv gnat_ gnat
           # drop python if any
           rm -rf -v ./cached_gnat/gnat*/bin/python*
           # This is to avoid locking .sh on win that prevents its updating