Merge pull request #640 from psafont/setup-v2

ci: update setup-ocaml to v2
xapi-project · Jul 20, 2023 · 7e65707 · 7e65707
2 parents bee32d1 + 6ffdaf7
commit 7e65707
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,48 +14,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ocaml-version: ["4.14.1"]
+        ocaml-compiler: ["4.14.1"]
         experimental: [false]
           # include:
-          # - ocaml-version: "5.2.0"
+          # - ocaml-compiler: "5.2.0"
           #   experimental: true
 
     continue-on-error: ${{ matrix.experimental }}
-    env:
-      OCAML_VERSION: ${{ matrix.ocaml-version }}
-
     steps:
       - name: Update apt cache
         run: sudo apt-get update
-        shell: bash
 
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Retrieve date for cache key
-        id: cache-key
-        run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Restore opam cache
-        id: opam-cache
-        uses: actions/cache@v3
-        with:
-          path: "~/.opam"
-          # invalidate cache daily, gets built daily using a scheduled job
-          key: ${{ steps.cache-key.outputs.date }}-${{ matrix.ocaml-version }}
-
       - name: Use ocaml
-        uses: avsm/setup-ocaml@v1
+        uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-version: ${{ matrix.ocaml-version }}
-          opam-repository: "."
-
-      - name: Upgrade existing packages
-        run: |
-          opam update
-          opam depext -vv -y xs-toolstack
-          opam upgrade
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-repositories: |
+            xs-opam: "."
+          opam-pin: false
+          dune-cache: true
 
       - name: Check whether there are packages with more than a version
         run: tools/no-duplicates-check.bash
@@ -67,8 +47,11 @@ jobs:
         run: tools/license-check.sh
 
       - name: Build xs-toolstack, test its dependencies
+        # opam install may ignore installing depexts sometimes
+        # OPAMCOLOR is set to "always" by default and it breaks piping
         run: |
-          OPAMERRLOGLEN=10000 opam list -s --required-by xs-toolstack | xargs opam install -t
+          OPAMERRLOGLEN=10000 OPAMCOLOR=NEVER opam list -s --required-by xs-toolstack | xargs opam depext -tu
+          OPAMERRLOGLEN=10000 OPAMCOLOR=NEVER opam list -s --required-by xs-toolstack | xargs opam install -t
 
       - name: Uninstall unversioned packages
         # This should purge them from the cache, unversioned package have

diff --git a/tools/find-unused-packages.sh b/tools/find-unused-packages.sh
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+export OPAMCOLOR=NEVER
+
 USED=$(opam list -t --required-by xs-toolstack --recursive --short | sort)
 UPSTREAM=$(find "packages/upstream/" -mindepth 1 -maxdepth 1 -type d -print0 | xargs -0 -I {} echo "{}" | cut -d "/" -f 3 | cut -d "." -f 1 | sort | uniq)
 XS=$(find "packages/xs/" -mindepth 1 -maxdepth 1 -type d -print0 | xargs -0 -I {} echo "{}" | cut -d "/" -f 3 | cut -d "." -f 1 | sort | uniq)

diff --git a/tools/no-duplicates-check.bash b/tools/no-duplicates-check.bash
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+export OPAMCOLOR=NEVER
+
 function check_no_duplicates {
   packages="$1"
   allowed_dupes_file="$2"