From bc15dab4e963fe1f68e1b026706d2c1867f9fdc8 Mon Sep 17 00:00:00 2001
From: Hugo Heuzard <hugo.heuzard@lambda-coins.com>
Date: Sat, 15 Jun 2024 17:27:21 +0200
Subject: [PATCH 1/2] Switch to opam 2.2

---
 .github/workflows/build.yml | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ccfa6c6..aa05455 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,45 +19,25 @@ jobs:
           - windows-latest
           - macos-latest
         ocaml-compiler:
-          - 4.14.x
-        include:
-          - os: ubuntu-latest
-            ocaml-compiler: 5.1.x
-          - os: macos-latest
-            ocaml-compiler: 5.1.x
-          - os: windows-latest
-            ocaml-compiler: ocaml.5.0.0,ocaml-option-mingw
+          - "4.14"
+          - "5.2"
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
-        if: runner.os != 'Windows'
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3.0.0-beta
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: true
-          opam-depext: true
-          opam-depext-flags: --with-test
+          allow-prerelease-opam: true
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
-        if: runner.os == 'Windows'
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          opam-repositories: |
-            dra27: https://github.com/dra27/opam-repository.git#windows-5.0
-            default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
-            opam: https://github.com/ocaml/opam-repository.git
-          dune-cache: true
-          opam-depext: true
-          opam-depext-flags: --with-test
+      - run: opam install -v . --with-test --deps-only
 
       - name: configure tree
-        run: opam exec -- ./configure
+        run: opam exec -- sh ./configure
 
       - name: Build
         run: opam exec -- make
@@ -68,4 +48,3 @@ jobs:
       - run: opam install . --with-test
 
       - run: opam exec -- git diff --exit-code
-        if: ${{ !matrix.skip-test }}

From 5208883e308036c543dfae4161cd3551f5aadcd3 Mon Sep 17 00:00:00 2001
From: hhugo <hugo.heuzard@gmail.com>
Date: Tue, 2 Jul 2024 07:36:19 +0200
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Sora Morimoto <sora@morimoto.io>
---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa05455..425a3b9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,12 +29,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3.0.0-beta
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          allow-prerelease-opam: true
 
-      - run: opam install -v . --with-test --deps-only
+      - run: opam install . --with-test --deps-only
 
       - name: configure tree
         run: opam exec -- sh ./configure