Update Github workflows.

pyjarrett · Jan 18, 2024 · 6dbc8e6 · 6dbc8e6
1 parent 2fae9cb
commit 6dbc8e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 34 deletions.
diff --git a/.github/workflows/ada.yml b/.github/workflows/ada.yml
@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, workflows ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, workflows ]
 
 jobs:
   build:
@@ -18,20 +18,9 @@ jobs:
 
     steps:    
        - name: Checkout
-         uses: actions/checkout@v2
-       - name: ada-actions/toolchain
-         uses: ada-actions/toolchain@ce2021
-         with:
-           distrib: community
-           target: native
-       - name: alire-project/setup-alire
-         uses: alire-project/setup-alire@latest-stable
+         uses: actions/checkout@v3
+       - name: alire-project/setup-alire@v2
+         uses: alire-project/setup-alire@v2
        - name: Build
          run: |
-            alr index --reset-community
-            alr config --global --set toolchain.assistant false
-            alr toolchain --install gnat_native --non-interactive
-            alr toolchain --install gprbuild --non-interactive
-            alr toolchain --select gnat_native --non-interactive
-            alr toolchain --select gprbuild --non-interactive
-            alr build --non-interactive
+            alr --no-tty build
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -2,9 +2,9 @@ name: Unit Tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, workflows ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, workflows ]
 
 jobs:
   build:
@@ -18,22 +18,11 @@ jobs:
 
     steps:    
        - name: Checkout
-         uses: actions/checkout@v2
-       - name: ada-actions/toolchain
-         uses: ada-actions/toolchain@ce2021
-         with:
-           distrib: community
-           target: native
-       - name: alire-project/setup-alire
-         uses: alire-project/setup-alire@latest-stable
+         uses: actions/checkout@v3
+       - name: alire-project/setup-alire@v2
+         uses: alire-project/setup-alire@v2
        - name: Build
          working-directory: tests/
          run: |
-            alr index --reset-community
-            alr config --global --set toolchain.assistant false
-            alr toolchain --install gnat_native --non-interactive
-            alr toolchain --install gprbuild --non-interactive
-            alr toolchain --select gnat_native --non-interactive
-            alr toolchain --select gprbuild --non-interactive
-            alr build --non-interactive
+            alr --no-tty build
             alr run