From 7725523177bffff848bfdb4767c358923c03747d Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Thu, 4 Jul 2024 15:57:20 +0200 Subject: [PATCH 1/5] Update to setup-ocaml v3 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a14de033..85218357 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: ocaml/setup-ocaml@v2 + - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - run: opam pin -n . From d119249e0efcb36f58726f72a9595520405115cd Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Thu, 4 Jul 2024 16:03:19 +0200 Subject: [PATCH 2/5] Test on 5.0.0 and 5.2.0, without excluding 5.0-windows combination --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85218357..62c0b821 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,10 +19,8 @@ jobs: - 4.08.x - 4.12.x - 4.14.x - - ocaml-base-compiler.5.0.0 - exclude: - - os: windows-latest - ocaml-compiler: ocaml-base-compiler.5.0.0 + - 5.0.0 + - 5.2.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 0f4a2a3fcc393e8ae4b4b44a5d69f6c85d9da95e Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Thu, 4 Jul 2024 16:18:42 +0200 Subject: [PATCH 3/5] mimic https://github.com/avsm/hello-world-action-ocaml more closely --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 62c0b821..483a2e96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,17 +10,18 @@ jobs: run: name: Build strategy: + fail-fast: false matrix: os: - macos-13 - ubuntu-latest - windows-latest ocaml-compiler: - - 4.08.x - - 4.12.x - - 4.14.x - - 5.0.0 - - 5.2.0 + - "4.08" + - "4.12" + - "4.14" + - "5.0" + - "5.2" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From e13741d5a801fc722188575adb7f51743bffc9b1 Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Thu, 4 Jul 2024 16:39:03 +0200 Subject: [PATCH 4/5] Exclude Windows 4.08 and 4.12 combinations --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 483a2e96..f7c49a1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,11 @@ jobs: - "4.14" - "5.0" - "5.2" + exclude: + - os: windows-latest + ocaml-compiler: "4.08" + - os: windows-latest + ocaml-compiler: "4.12" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 03573d7afa0bee260916d9c6adaf04324b5472e3 Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Thu, 4 Jul 2024 16:42:39 +0200 Subject: [PATCH 5/5] Remove opam depext dependency --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f7c49a1f..a455c1ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,9 +33,7 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - - run: opam pin -n . - - run: opam depext -yt qcheck qcheck-core qcheck-ounit qcheck-alcotest - - run: opam install -t . --deps-only + - run: opam install . --deps-only --with-test - run: opam exec -- dune build - run: opam exec -- dune runtest if: ${{ matrix.os != 'windows-latest'}}