U922-009 Change toolchain to Alire GCC 11.

AdaCore · Sep 25, 2021 · 79b85b2 · 79b85b2
1 parent bdad0d7
commit 79b85b2
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,33 +12,32 @@ jobs:
     steps:
       - name: Get VSS
         uses: actions/checkout@v2
+        with:
+          path: ./vss
       - 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_v1
+          restore-keys: ${{ runner.os }}-alire_v1
+      - 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: Get UCD.zip
         run: |
-          curl -C - -o ./cached_gnat/UCD-13.0.0.zip https://www.unicode.org/Public/13.0.0/ucd/UCD.zip
-          mkdir data
-          mkdir data/ucd
-          unzip cached_gnat/UCD-13.0.0.zip -d ./data/ucd
+          curl -C - -o UCD-13.0.0.zip https://www.unicode.org/Public/13.0.0/ucd/UCD.zip
+          mkdir vss/data
+          mkdir vss/data/ucd
+          unzip UCD-13.0.0.zip -d vss/data/ucd
       - name: Build and test
+        shell: bash
         run: |
-          make all check coverage BUILD_MODE=${{ matrix.build_mode }}
-          make install check_install PREFIX=/tmp BUILD_MODE=${{ matrix.build_mode }}
+          export PATH=`ls -d $PWD/cached_gnat/*/bin |tr '\n' ':'`$PATH
+          make -C vss all check coverage BUILD_MODE=${{ matrix.build_mode }}
+          make -C vss install check_install PREFIX=/tmp BUILD_MODE=${{ matrix.build_mode }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         if: ${{ matrix.build_mode == 'coverage' }}
+        with:
+          working-directory: vss