Improve alt-ergo CI steps

alire-project · Oct 20, 2023 · 44b0294 · 44b0294
1 parent c1f6e0c
commit 44b0294
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -181,14 +181,11 @@ jobs:
 
 
   alt_ergo:
-    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        ocaml-version:
-          - 4.10.0
-    env:
-        OPAMYES: true
-        OCAML_DEFAULT_VERSION: 4.10.0
+        ocaml-compiler:
+          - "4.11.2"
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -197,11 +194,9 @@ jobs:
           ref: 'master'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
-        uses: ocaml/setup-ocaml@v1.1.11
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ matrix.ocaml-version }}
-
-      - run: opam pin alt-ergo . -y
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
       - run: opam install alt-ergo --destdir=/tmp/alt-ergo-install
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -177,13 +177,11 @@ jobs:
 
 
   alt_ergo:
-    env:
-        OPAMYES: true
-        OCAML_DEFAULT_VERSION: 4.10.0
     strategy:
       matrix:
-        ocaml-version:
-          - 4.10.0
+        ocaml-compiler:
+          - "4.11.2"
+
     runs-on: macos-12
     steps:
       - name: Checkout code
@@ -193,11 +191,9 @@ jobs:
           ref: 'master'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
-        uses: ocaml/setup-ocaml@v1.1.11
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ matrix.ocaml-version }}
-
-      - run: opam pin alt-ergo . -y
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
       - run: opam install alt-ergo --destdir=/tmp/alt-ergo-install
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -227,9 +227,10 @@ jobs:
 
 
   alt_ergo:
-    env:
-        OPAMYES: true
-        OCAML_DEFAULT_VERSION: 4.10.0
+    strategy:
+      matrix:
+        ocaml-compiler:
+          - "4.11.2"
     runs-on: windows-2019
     steps:
       - name: Checkout code
@@ -238,14 +239,12 @@ jobs:
           repository: 'adacore/alt-ergo'
           ref: 'master'
 
-      - name: Use Setup OCaml v1 ${{ matrix.ocaml-version }}
-        uses: ocaml/setup-ocaml@v1.1.11
+      - name: Use Setup OCaml {{ matrix.ocaml-version }}
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ matrix.ocaml-version }}
-
-      - run: opam pin alt-ergo . -y
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
-      - run: opam install alt-ergo --destdir==C:/alt-ergo-install
+      - run: opam install alt-ergo --destdir=/tmp/alt-ergo-install
 
       - run: git log --format="%H" -n 1 > C:/alt-ergo-install/alt-ergo-version.txt