From 00e44578118747ee7910f434d251c77d0e7d3175 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 2 Aug 2024 13:16:41 +0100 Subject: [PATCH 1/2] ci: use ocaml-setup v3 Signed-off-by: Pau Ruiz Safont --- .github/workflows/format.yml | 3 +-- .github/workflows/setup-xapi-environment/action.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index aca7f00f4a6..4d0350056f3 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -28,14 +28,13 @@ jobs: run: sudo apt-get update - name: Use ocaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }} opam-repositories: | xs-opam: ${{ steps.dotenv.outputs.repository }} dune-cache: true opam-pin: false - opam-depext: false - name: Install ocamlformat run: opam install ocamlformat diff --git a/.github/workflows/setup-xapi-environment/action.yml b/.github/workflows/setup-xapi-environment/action.yml index a7890222498..e2f85bbb886 100644 --- a/.github/workflows/setup-xapi-environment/action.yml +++ b/.github/workflows/setup-xapi-environment/action.yml @@ -45,7 +45,7 @@ runs: # We set DUNE_CACHE_STORAGE_MODE, it is required for dune cache to work inside opam for now, # otherwise it gets EXDEV and considers it a cache miss - name: Use ocaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }} opam-repositories: | From f8ac0cbaf636760adbf0e61ae8071532678dbea1 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 2 Aug 2024 13:33:50 +0100 Subject: [PATCH 2/2] ci: Do not spend time pinning packages It takes literally minutes, for little benefit, now that opam 2.2.0 is used Signed-off-by: Pau Ruiz Safont --- .github/workflows/setup-xapi-environment/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/setup-xapi-environment/action.yml b/.github/workflows/setup-xapi-environment/action.yml index e2f85bbb886..72700599cf2 100644 --- a/.github/workflows/setup-xapi-environment/action.yml +++ b/.github/workflows/setup-xapi-environment/action.yml @@ -51,6 +51,7 @@ runs: opam-repositories: | xs-opam: ${{ steps.dotenv.outputs.repository }} dune-cache: true + opam-pin: false env: DUNE_CACHE_STORAGE_MODE: copy