From 1e8d485223c19a881b8dfd267d4a3897f0dc2b24 Mon Sep 17 00:00:00 2001
From: Alejandro R Mosteo <amosteo@unizar.es>
Date: Fri, 15 Mar 2024 10:16:30 +0100
Subject: [PATCH] Remove use of GNAT Community Edition (#1641)

setup-alire@v3 no longer uses GNAT CE so we can always test with GNAT FSF.
---
 .github/workflows/ci-community.yml | 81 ------------------------------
 .github/workflows/nightly.yml      |  8 +--
 2 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 .github/workflows/ci-community.yml

diff --git a/.github/workflows/ci-community.yml b/.github/workflows/ci-community.yml
deleted file mode 100644
index ca4028e04..000000000
--- a/.github/workflows/ci-community.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-name: CI Community
-# Check proper build using the community edition of the AdaCore toolchain
-
-on:
-  pull_request:
-    paths-ignore:
-        - 'doc/**'
-        - '**.md'
-        - '**.rst'
-        - '**.txt'
-  workflow_dispatch:
-
-jobs:
-
-  build:
-    name: ce${{matrix.version}} on ${{ matrix.os }}
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false # Attempt to generate as many of them as possible
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-        version:
-          - 2020
-          - 2021
-        exclude:
-          - os: macos-latest
-            version: 2021 # it was never released for macOS
-
-    steps:
-    - name: Check out repository
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    # Until some stable alr with `alr install` is available, we cannot rely on
-    # the alr-install action, as that introduces a circular dependency. If a
-    # nightly build were to fail, there's no way to do an `alr install` anymore
-    # TODO: replace with `alr-install` once alr 2.0 is out.
-
-    # We cannot use variable names in the action reference, so we need to make
-    # them explicit twice
-    - name: Install Community 2020 toolchain
-      uses: ada-actions/toolchain@ce2020
-      if: ${{ matrix.version == '2020' }}
-      with:
-        distrib: community
-
-    - name: Install Community 2021 toolchain
-      uses: ada-actions/toolchain@ce2021
-      if: ${{ matrix.version == '2021' }}
-      with:
-        distrib: community
-
-    - name: Install Python 3.x (required for the testsuite)
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-
-    - name: Run test script
-      run: scripts/ci-github.sh
-      shell: bash
-
-    - name: Upload logs (if failed)
-      if: failure()
-      uses: actions/upload-artifact@master
-      with:
-        name: e3-log-linux.zip
-        path: testsuite/out
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: alr-bin-${{ matrix.os }}.zip
-        path: |
-          bin/alr*
-          LICENSE.txt
\ No newline at end of file
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 8f0127dcc..502f20e7b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -32,14 +32,8 @@ jobs:
       with:
         submodules: true
 
-    # Until some stable alr with `alr install` is available, we cannot rely on
-    # the alr-install action, as that introduces a circular dependency. If a
-    # nightly build were to fail, there's no way to do an `alr install` anymore
-    # TODO: replace with `alr-install` once alr 2.0 is out.
     - name: Install FSF toolchain
-      uses: ada-actions/toolchain@ce2020
-      with:
-        distrib: community
+      uses: alire-project/setup-alire@v3
 
     - name: Replace toolchain with aarch64
       if: ${{ runner.arch == 'ARM64' }}