Skip to content

Commit 64d8a43

Browse files
AlizterAlizter
committed
chore: update CI to OCaml 5.5
Signed-off-by: Ali Caglayan <alizter@gmail.com>
1 parent cf9bac6 commit 64d8a43

11 files changed

Lines changed: 102 additions & 147 deletions

File tree

‎.github/workflows/bench.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
os:
2323
- ubuntu-latest
2424
ocaml-compiler:
25-
- 5.4.x
25+
- 5.5.x
2626

2727
runs-on: ${{ matrix.os }}
2828

‎.github/workflows/bench.yml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
os:
2222
- ubuntu-latest
2323
ocaml-compiler:
24-
- 5.4.x
24+
- 5.5.x
2525

2626
runs-on: ${{ matrix.os }}
2727

‎.github/workflows/workflow.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
#
2424

2525
nix-build:
26-
name: Bootstrap with OCaml 5.4
26+
name: Bootstrap with OCaml 5.5
2727
strategy:
2828
fail-fast: false
2929
matrix:
@@ -154,28 +154,28 @@ jobs:
154154
os: ubuntu-latest
155155
# OCaml 5:
156156
## ubuntu (x86)
157-
- ocaml-compiler: 5.4.x
158-
cache-prefix: 5.4.x
157+
- ocaml-compiler: 5.5.x
158+
cache-prefix: 5.5.x
159159
os: ubuntu-latest
160160
run_tests: true
161161
## macos (Apple Silicon)
162-
- ocaml-compiler: 5.4.x
163-
cache-prefix: 5.4.x
162+
- ocaml-compiler: 5.5.x
163+
cache-prefix: 5.5.x
164164
os: macos-latest
165165
run_tests: true
166166
## macos (x86)
167-
- ocaml-compiler: 5.4.x
168-
cache-prefix: 5.4.x
167+
- ocaml-compiler: 5.5.x
168+
cache-prefix: 5.5.x
169169
os: macos-15-intel
170170
## MSVC
171-
- ocaml-compiler: ocaml-compiler.5.4.0,system-msvc
171+
- ocaml-compiler: ocaml-compiler.5.5.0,system-msvc
172172
os: windows-latest
173-
cache-prefix: ocaml-compiler.5.4.0-system-msvc
173+
cache-prefix: ocaml-compiler.5.5.0-system-msvc
174174
run_tests: true
175175
## mingw
176-
- ocaml-compiler: ocaml-base-compiler.5.4.0,system-mingw
176+
- ocaml-compiler: ocaml-base-compiler.5.5.0,system-mingw
177177
os: windows-latest
178-
cache-prefix: ocaml-compiler.5.4.0-system-mingw
178+
cache-prefix: ocaml-compiler.5.5.0-system-mingw
179179
run_tests: true
180180
# OCaml 4:
181181
## ubuntu (x86)

‎.github/workflows/workflow.yml.in‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
#
2323

2424
nix-build:
25-
name: Bootstrap with OCaml 5.4
25+
name: Bootstrap with OCaml 5.5
2626
strategy:
2727
fail-fast: false
2828
matrix:
@@ -153,28 +153,28 @@ jobs:
153153
os: ubuntu-latest
154154
# OCaml 5:
155155
## ubuntu (x86)
156-
- ocaml-compiler: 5.4.x
157-
cache-prefix: 5.4.x
156+
- ocaml-compiler: 5.5.x
157+
cache-prefix: 5.5.x
158158
os: ubuntu-latest
159159
run_tests: true
160160
## macos (Apple Silicon)
161-
- ocaml-compiler: 5.4.x
162-
cache-prefix: 5.4.x
161+
- ocaml-compiler: 5.5.x
162+
cache-prefix: 5.5.x
163163
os: macos-latest
164164
run_tests: true
165165
## macos (x86)
166-
- ocaml-compiler: 5.4.x
167-
cache-prefix: 5.4.x
166+
- ocaml-compiler: 5.5.x
167+
cache-prefix: 5.5.x
168168
os: macos-15-intel
169169
## MSVC
170-
- ocaml-compiler: ocaml-compiler.5.4.0,system-msvc
170+
- ocaml-compiler: ocaml-compiler.5.5.0,system-msvc
171171
os: windows-latest
172-
cache-prefix: ocaml-compiler.5.4.0-system-msvc
172+
cache-prefix: ocaml-compiler.5.5.0-system-msvc
173173
run_tests: true
174174
## mingw
175-
- ocaml-compiler: ocaml-base-compiler.5.4.0,system-mingw
175+
- ocaml-compiler: ocaml-base-compiler.5.5.0,system-mingw
176176
os: windows-latest
177-
cache-prefix: ocaml-compiler.5.4.0-system-mingw
177+
cache-prefix: ocaml-compiler.5.5.0-system-mingw
178178
run_tests: true
179179
# OCaml 4:
180180
## ubuntu (x86)

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DEV_DEPS := \
1212
core_bench \
1313
patdiff
1414

15-
TEST_OCAMLVERSION := 5.4.0
15+
TEST_OCAMLVERSION := 5.5.0
1616
# When updating this version, don't forget to also bump the number in the docs.
1717

1818
-include Makefile.dev

‎doc/tutorials/developing-with-dune/introduction.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Let's create a local switch: `cd` to this directory and run the following comman
4444
This can take a few minutes.
4545

4646
```sh
47-
opam switch create ./ 5.4.0
47+
opam switch create ./ 5.5.0
4848
```
4949

5050
This command has created a directory named `_opam` in the current directory.

‎flake.lock‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
inputs = {
33
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
44
melange = {
5-
url = "github:melange-re/melange/v7-54";
5+
url = "github:melange-re/melange/v7-55";
66
inputs.nixpkgs.follows = "nixpkgs";
77
};
88
ocaml-overlays = {
@@ -37,13 +37,10 @@
3737
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
3838
system:
3939
let
40-
# Vanilla nixpkgs scope used to source packages we want to take
41-
# ahead of what `ocaml-overlays` ships (e.g. odoc 3.2.1).
42-
nixpkgsOcaml = nixpkgs.legacyPackages.${system}.ocaml-ng.ocamlPackages_5_4;
4340
pkgs = nixpkgs.legacyPackages.${system}.appendOverlays [
4441
ocaml-overlays.overlays.default
4542
(self: super: {
46-
ocamlPackages = super.ocaml-ng.ocamlPackages_5_4.overrideScope (
43+
ocamlPackages = super.ocaml-ng.ocamlPackages_5_5.overrideScope (
4744
oself: osuper: {
4845
ocaml = osuper.ocaml.override {
4946
flambdaSupport = false;
@@ -53,11 +50,9 @@
5350
dontGzipMan = true;
5451
};
5552
odoc-parser = osuper.odoc-parser.overrideAttrs (old: {
56-
inherit (nixpkgsOcaml.odoc-parser) version src;
5753
doCheck = false;
5854
});
5955
odoc = osuper.odoc.overrideAttrs (old: {
60-
inherit (nixpkgsOcaml.odoc) version src;
6156
doCheck = false;
6257
});
6358
# Templates the cross-compiled dune binary used by
@@ -69,16 +64,16 @@
6964
dune_target = oself.callPackage ./nix/dune-target.nix { };
7065
}
7166
);
72-
# Keep `ocaml-ng.ocamlPackages_5_4` in sync with the override
67+
# Keep `ocaml-ng.ocamlPackages_5_5` in sync with the override
7368
# above. nix-overlays' `cross/ocaml.nix:46` looks up the native
74-
# OCaml via `buildPackages.ocaml-ng."ocamlPackages_5_4"`, so
69+
# OCaml via `buildPackages.ocaml-ng."ocamlPackages_5_5"`, so
7570
# without this the cross-target side uses our overridden ocaml
7671
# while the native side (used to build findlib's `nativeBuild-
7772
# Inputs` etc.) uses the unoverridden ocaml+flambda — the
7873
# mismatch shows up as cross `ocamlopt` rejecting native
7974
# `topdirs.cmx` ("not a compilation unit description").
8075
ocaml-ng = super.ocaml-ng // {
81-
ocamlPackages_5_4 = self.ocamlPackages;
76+
ocamlPackages_5_5 = self.ocamlPackages;
8277
};
8378
})
8479
melange.overlays.default

‎nix/dune-package.nix‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,25 @@ let
8282
# ocaml itself excludes mingw via `meta.platforms`. Widen it
8383
# so cross builds against this scope evaluate.
8484
ocaml = osuper.ocaml.overrideAttrs (o: {
85-
meta = (o.meta or { }) // { platforms = lib.platforms.all; };
85+
meta = (o.meta or { }) // {
86+
platforms = lib.platforms.all;
87+
};
8688
});
8789
buildDunePackage =
8890
arg:
8991
let
90-
widen = a: a // {
91-
meta = (a.meta or { }) // { platforms = lib.platforms.all; };
92-
};
92+
widen =
93+
a:
94+
a
95+
// {
96+
meta = (a.meta or { }) // {
97+
platforms = lib.platforms.all;
98+
};
99+
};
93100
in
94101
# nix-overlays' `buildDunePackage` accepts either an attrset
95102
# or a `final: attrset` function (see `cross/ocaml.nix`).
96-
osuper.buildDunePackage (
97-
if builtins.isFunction arg then final: widen (arg final) else widen arg
98-
);
103+
osuper.buildDunePackage (if builtins.isFunction arg then final: widen (arg final) else widen arg);
99104
}
100105
);
101106
})

0 commit comments

Comments
 (0)