From 8007ca80154802228011891f5042a09b2d70f7c1 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 11 Aug 2026 18:40:50 -0700 Subject: [PATCH 1/3] ci: test OCaml 5.6 --- .github/workflows/nix-build.yml | 3 +-- .github/workflows/opam-ci.yml | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 59b6f7d83..475c2fcf6 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -28,7 +28,7 @@ jobs: - 5_5 - 5_6 include: - - {ocaml-version: 5_5, os: ubuntu-26.04-arm} + - {ocaml-version: 5_6, os: ubuntu-26.04-arm} runs-on: ${{ matrix.os }} steps: @@ -66,4 +66,3 @@ jobs: extra-trusted-public-keys = ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY= - name: "Run nix-build" run: nix-build ./nix/ci.nix --argstr ocamlVersion ${{ matrix.setup.ocaml-version }} - diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index 073894ba9..e4ed84bcb 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -27,14 +27,17 @@ jobs: - {ocaml-compiler: 'ocaml-base-compiler.5.3.0', os: ubuntu-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.4.0', os: ubuntu-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', os: ubuntu-latest} + - {ocaml-compiler: 'ocaml-variants.5.6.0+trunk', os: ubuntu-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.4.0', os: macos-26-intel} - {ocaml-compiler: 'ocaml-base-compiler.5.4.0', os: macos-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', os: macos-latest} + - {ocaml-compiler: 'ocaml-variants.5.6.0+trunk', os: macos-latest} # looks like setup-ocaml@v3 can only run actions on windows for # OCaml >= 4.13 # https://github.com/ocaml/setup-ocaml/issues/822#issuecomment-2215525942 - {ocaml-compiler: '4.14.x', os: windows-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', os: windows-latest} + - {ocaml-compiler: 'ocaml-variants.5.6.0+trunk', os: windows-latest} runs-on: ${{ matrix.setup.os }} From 86636dca429cdd7e98dd325de114ea826f957af9 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 11 Aug 2026 18:43:06 -0700 Subject: [PATCH 2/3] ci: pin utop for OCaml 5.6 --- .github/workflows/opam-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index e4ed84bcb..a7515f353 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -68,6 +68,10 @@ jobs: path: _opam key: v0.0.1-opam-${{ matrix.setup.os }}-${{ matrix.setup.ocaml-compiler }}-${{ hashFiles('**.opam') }} + - name: Pin utop for OCaml 5.6 + if: ${{ matrix.setup.ocaml-compiler == 'ocaml-variants.5.6.0+trunk' }} + run: opam pin add utop https://github.com/ocaml-community/utop/archive/64f4486318c128f531f95fddd1f19fa5b0c95191.tar.gz + - name: Install dependencies run: opam install . --deps-only From b94a7b9cc264d9f0dbfed89507dcb2cd6f8f0567 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 11 Aug 2026 19:35:50 -0700 Subject: [PATCH 3/3] ci: retain OCaml 5.5 ARM build --- .github/workflows/nix-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 475c2fcf6..78d58a2fc 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -28,6 +28,7 @@ jobs: - 5_5 - 5_6 include: + - {ocaml-version: 5_5, os: ubuntu-26.04-arm} - {ocaml-version: 5_6, os: ubuntu-26.04-arm} runs-on: ${{ matrix.os }}