From db9ce53659ec125e2ad6f4c2bf36f11dc45eaab7 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Jun 2026 18:29:50 -0700 Subject: [PATCH 1/4] ci: build on OCaml 5.5 --- .github/workflows/nix-build.yml | 3 ++- .github/workflows/opam-ci.yml | 8 ++------ flake.lock | 14 +++++++------- flake.nix | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index d96fb1e3b..901c8ffb4 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -23,6 +23,7 @@ jobs: - 5_2 - 5_3 - 5_4 + - 5_5 runs-on: ubuntu-latest steps: @@ -43,10 +44,10 @@ jobs: strategy: matrix: setup: - - {ocaml-version: '5_3', os: macos-15-intel} - {ocaml-version: '4_14', os: macos-latest} - {ocaml-version: '5_3', os: macos-latest} - {ocaml-version: '5_4', os: macos-latest} + - {ocaml-version: '5_5', os: macos-latest} runs-on: ${{ matrix.setup.os }} steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index ab307aadc..13f3b5ab5 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -26,10 +26,10 @@ jobs: - {ocaml-compiler: '4.14.x', os: ubuntu-latest} - {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~alpha1', os: ubuntu-latest} + - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', os: ubuntu-latest} - {ocaml-compiler: 'ocaml-base-compiler.5.4.0', os: macos-15-intel} - {ocaml-compiler: 'ocaml-base-compiler.5.4.0', os: macos-latest} - - {ocaml-compiler: 'ocaml-base-compiler.5.5.0~alpha1', os: macos-latest} + - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', 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 @@ -64,10 +64,6 @@ jobs: path: _opam key: v0.0.1-opam-${{ matrix.setup.os }}-${{ matrix.setup.ocaml-compiler }}-${{ hashFiles('**.opam') }} - - name: Pin utop for OCaml 5.5 - if: ${{ matrix.setup.ocaml-compiler == 'ocaml-base-compiler.5.5.0~alpha1' }} - run: opam pin add utop --dev-repo - - name: Install dependencies run: opam install . --deps-only diff --git a/flake.lock b/flake.lock index 73a4c0186..ea93fdef5 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772923463, - "narHash": "sha256-doF5P6h72PgGgZosq1CV6XGPg6J+gRQCOHN/GmRwsu0=", + "lastModified": 1782090703, + "narHash": "sha256-2+ZNFE9G4QJz3W+cwRIHp3ckDvIhgLZNchAGgwemUSA=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "27d83e36fd6d0ac659ac6736451444ffbcef3f67", + "rev": "e50f291c63f3e992cc726e9adc5a775bbaf7bb79", "type": "github" }, "original": { @@ -20,17 +20,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772906963, - "narHash": "sha256-jT3m0eiRH9TLqMsMVblze5/DPupInp8Qc8Gop8Zxfho=", + "lastModified": 1782058286, + "narHash": "sha256-U7bO7gEY2KvrJ+Ha8tKQKJATdPi9Wf1ygrJLdVV6F+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a60c0dff24e7109c0e87fd53e5bbc0032fa0cbd", + "rev": "1745eb556759f12578e02d8a45e782a7b5924e2b", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a60c0dff24e7109c0e87fd53e5bbc0032fa0cbd", + "rev": "1745eb556759f12578e02d8a45e782a7b5924e2b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f2dcd45de..1ffdb66be 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ let pkgs = nixpkgs.legacyPackages.${system}.extend ( self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_4; + ocamlPackages = super.ocaml-ng.ocamlPackages_5_5; } ); in From 1434b80da3cd0ad562071eb33a28815e777a6dee Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Jun 2026 18:36:37 -0700 Subject: [PATCH 2/4] pin 4.08 / 4.10? --- .github/workflows/opam-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index 13f3b5ab5..9b61c8d7f 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -19,8 +19,8 @@ jobs: fail-fast: false matrix: setup: - - {ocaml-compiler: '4.08.x', os: ubuntu-latest} - - {ocaml-compiler: '4.10.x', os: ubuntu-latest} + - {ocaml-compiler: '4.08.1', os: ubuntu-latest} + - {ocaml-compiler: '4.10.2', os: ubuntu-latest} - {ocaml-compiler: '4.12.x', os: ubuntu-latest} - {ocaml-compiler: '4.13.x', os: ubuntu-latest} - {ocaml-compiler: '4.14.x', os: ubuntu-latest} From f373750deee778dc8baac7b6aa002e552eb5540d Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Jun 2026 18:43:25 -0700 Subject: [PATCH 3/4] build on 4.08? --- .github/workflows/opam-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index 9b61c8d7f..11b5a9e1e 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -19,8 +19,8 @@ jobs: fail-fast: false matrix: setup: - - {ocaml-compiler: '4.08.1', os: ubuntu-latest} - - {ocaml-compiler: '4.10.2', os: ubuntu-latest} + - {ocaml-compiler: 'ocaml-base-compiler.4.08.1', os: ubuntu-latest, opam-repositories: 'default: git+https://github.com/ocaml/opam-repository.git#622e2cd03db68197f7299596fa614b2f91aa9260'} + - {ocaml-compiler: 'ocaml-base-compiler.4.10.2', os: ubuntu-latest, opam-repositories: 'default: git+https://github.com/ocaml/opam-repository.git#622e2cd03db68197f7299596fa614b2f91aa9260'} - {ocaml-compiler: '4.12.x', os: ubuntu-latest} - {ocaml-compiler: '4.13.x', os: ubuntu-latest} - {ocaml-compiler: '4.14.x', os: ubuntu-latest} @@ -46,6 +46,7 @@ jobs: uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.setup.ocaml-compiler }} + opam-repositories: "${{ matrix.setup.opam-repositories || 'default: git+https://github.com/ocaml/opam-repository.git' }}" opam-pin: true - name: Load opam cache when not Windows @@ -98,4 +99,3 @@ jobs: with: path: _opam key: v0.0.1-opam-${{ matrix.setup.os }}-${{ matrix.setup.ocaml-compiler }}-${{ hashFiles('**.opam') }} - From 0f3e92d5be74e83332ed117b9c1d4cbe2684ed08 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Jun 2026 18:50:29 -0700 Subject: [PATCH 4/4] build on 5.5.0 on windows --- .github/workflows/opam-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml index 11b5a9e1e..434273fbe 100644 --- a/.github/workflows/opam-ci.yml +++ b/.github/workflows/opam-ci.yml @@ -34,7 +34,7 @@ jobs: # 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.4.0', os: windows-latest} + - {ocaml-compiler: 'ocaml-base-compiler.5.5.0', os: windows-latest} runs-on: ${{ matrix.setup.os }}