From 7e477b6752c1e464cf73d749d1be54656a0573fd Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Wed, 13 Mar 2024 22:32:17 +0100
Subject: [PATCH] New branch v3 that defaults to `alr 2.0`

---
 .github/workflows/selftest.yml   |  8 ++++----
 .github/workflows/test-cache.yml | 14 ++++++++------
 README.md                        |  2 +-
 action.yml                       |  6 +-----
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/selftest.yml b/.github/workflows/selftest.yml
index 30a930e3..56fcc946 100644
--- a/.github/workflows/selftest.yml
+++ b/.github/workflows/selftest.yml
@@ -17,14 +17,14 @@ jobs:
 
     steps:
       - name: Check on proper branch
-        if: github.head_ref != 'v2-next'
+        if: github.head_ref != 'v3-next'
         uses: actions/github-script@v3
         with:
           script: |
             core.setFailed(`PRs for latest-stable must come from v2-next, but branch is ${{ github.head_ref }}`)
 
       - name: Setup stable
-        uses: alire-project/setup-alire@v2-next
+        uses: alire-project/setup-alire@v3-next
         if: matrix.target == 'stable'
         with:
           cache: false
@@ -32,14 +32,14 @@ jobs:
           # This way we make sure the cache isn't hiding any issue.
 
       - name: Setup nightly
-        uses: alire-project/setup-alire@v2-next
+        uses: alire-project/setup-alire@v3-next
         if: matrix.target == 'nightly'
         with:
           version: nightly
           cache: false
 
       - name: Setup from source (master)
-        uses: alire-project/setup-alire@v2-next
+        uses: alire-project/setup-alire@v3-next
         if: matrix.target == 'source'
         with:
           branch: master
diff --git a/.github/workflows/test-cache.yml b/.github/workflows/test-cache.yml
index 26680236..102b5228 100644
--- a/.github/workflows/test-cache.yml
+++ b/.github/workflows/test-cache.yml
@@ -1,5 +1,5 @@
 # Changes to the v2 branch must be proposed via PRs in the branch
-# v2-next. This way we can check the action just as GHA is going to
+# v3-next. This way we can check the action just as GHA is going to
 # use it.
 
 name: Test cache
@@ -12,9 +12,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        version: ['1.2.2', 'nightly', 'source']
+        version: ['2.0.0', '1.2.2', 'nightly', 'source']
         branch: ['', 'master']
         exclude: # These combos are redundant
+          - version: '2.0.0'
+            branch: master
           - version: '1.2.2'
             branch: master
           - version: nightly
@@ -26,17 +28,17 @@ jobs:
 
     steps:
       - name: Check PR comes from proper branch
-        if: (github.head_ref || github.ref) != 'v2-next'
+        if: (github.head_ref || github.ref) != 'v3-next'
         uses: actions/github-script@v3
         with:
           script: |
-            core.setFailed(`PRs for ${{github.base_ref}} must come from v2-next, but branch is ${{github.head_ref || github.ref}}`)
+            core.setFailed(`PRs for ${{github.base_ref}} must come from v3-next, but branch is ${{github.head_ref || github.ref}}`)
 
       # This might hit cache
 
       - name: Check action itself
         id: attempt_1
-        uses: alire-project/setup-alire@v2-next
+        uses: alire-project/setup-alire@v3-next
         with:
           version: ${{matrix.version}}
           branch: ${{matrix.branch}}
@@ -46,7 +48,7 @@ jobs:
       - name: Check action itself
         if: steps.attempt_1.outputs.cache_hit != 'true'
         id: attempt_2
-        uses: alire-project/setup-alire@v2-next
+        uses: alire-project/setup-alire@v3-next
         with:
           version: ${{matrix.version}}
           branch: ${{matrix.branch}}
diff --git a/README.md b/README.md
index d75662d8..cf2d540b 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ inputs:
   version:
     description: Use this argument to install a stable release. Use a version number without v prefix, e.g., 1.0.1, 1.1.0. This argument will be ignored if a branch argument is supplied. Defaults to the latest stable release.
     required: false
-    default: '1.2.2'
+    default: '2.0.0'
   branch:
     description: Use this argument to install a development branch (e.g., master). Using this option will require a preexisting compiler in the workflow environment.
     required: false
diff --git a/action.yml b/action.yml
index 15f6b8f9..05b87012 100644
--- a/action.yml
+++ b/action.yml
@@ -6,7 +6,7 @@ inputs:
   version:
     description: Use this argument to install a stable or nightly release. Use a version number without v prefix, e.g., 1.0.1, 1.1.0, or 'nightly'. This argument will be ignored if a branch argument is supplied. Defaults to the latest stable release.
     required: false
-    default: '1.2.2'
+    default: '2.0.0'
     # Also to be updated in test-cache-yml
   branch:
     description: Use this argument to install a development branch (e.g., master). Using this option will require a preexisting compiler in the workflow environment.
@@ -16,10 +16,6 @@ inputs:
     description: Arguments to pass to `alr toolchain` after setup.
     required: false
     default: 'gnat_native gprbuild'
-  toolchain_dir:
-    description: Location to install toolchain under.
-    required: false
-    default: ''
   cache:
     description: Whether to reuse a cached previous install.
     required: false