Skip to content

Commit 4eb90c2

Browse files
maisteLeonidas-from-XIV
maiste
and
Leonidas-from-XIV
authored
chore: bump dune version to 3.18 (#11478)
* chore: bump dune version Signed-off-by: Etienne Marais <[email protected]> * chore: bump to dune 3.18 Signed-off-by: Etienne Marais <[email protected]> * Bust the cache Signed-off-by: Marek Kubica <[email protected]> --------- Signed-off-by: Etienne Marais <[email protected]> Signed-off-by: Marek Kubica <[email protected]> Co-authored-by: Marek Kubica <[email protected]>
1 parent e378f5b commit 4eb90c2

17 files changed

+31
-15
lines changed

‎bench/monorepo/bench.Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ RUN wget https://github.com/ocaml-dune/ocaml-monorepo-benchmark/archive/refs/tag
134134
RUN opam init --disable-sandboxing --auto-setup
135135

136136
# make an opam switch for running benchmarks
137+
RUN echo "Cache busting to update the opam cache which serves no additional purpose besides this"
137138
RUN opam update && opam switch create bench 4.14.2
138139
RUN opam install -y dune ocamlbuild
139140

‎chrome-trace.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ homepage: "https://github.com/ocaml/dune"
1010
doc: "https://dune.readthedocs.io/"
1111
bug-reports: "https://github.com/ocaml/dune/issues"
1212
depends: [
13-
"dune" {>= "3.12"}
13+
"dune" {>= "3.18"}
1414
"ocaml" {>= "4.08.0"}
1515
"odoc" {with-doc}
1616
]
1717
dev-repo: "git+https://github.com/ocaml/dune.git"
18+
x-maintenance-intent: ["(latest)"]
1819
build: [
1920
["dune" "subst"] {dev}
2021
["rm" "-rf" "vendor/csexp"]

‎dune-action-plugin.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
1717
doc: "https://dune.readthedocs.io/"
1818
bug-reports: "https://github.com/ocaml/dune/issues"
1919
depends: [
20-
"dune" {>= "3.12"}
20+
"dune" {>= "3.18"}
2121
"dune-glob" {= version}
2222
"csexp" {>= "1.5.0"}
2323
"ppx_expect" {with-test}
@@ -28,6 +28,7 @@ depends: [
2828
"odoc" {with-doc}
2929
]
3030
dev-repo: "git+https://github.com/ocaml/dune.git"
31+
x-maintenance-intent: ["(latest)"]
3132
build: [
3233
["dune" "subst"] {dev}
3334
["rm" "-rf" "vendor/csexp"]

‎dune-build-info.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ homepage: "https://github.com/ocaml/dune"
1616
doc: "https://dune.readthedocs.io/"
1717
bug-reports: "https://github.com/ocaml/dune/issues"
1818
depends: [
19-
"dune" {>= "3.12"}
19+
"dune" {>= "3.18"}
2020
"ocaml" {>= "4.08"}
2121
"odoc" {with-doc}
2222
]
2323
dev-repo: "git+https://github.com/ocaml/dune.git"
24+
x-maintenance-intent: ["(latest)"]
2425
build: [
2526
["dune" "subst"] {dev}
2627
["rm" "-rf" "vendor/csexp"]

‎dune-configurator.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ homepage: "https://github.com/ocaml/dune"
1818
doc: "https://dune.readthedocs.io/"
1919
bug-reports: "https://github.com/ocaml/dune/issues"
2020
depends: [
21-
"dune" {>= "3.12"}
21+
"dune" {>= "3.18"}
2222
"ocaml" {>= "4.08.0"}
2323
"base-unix"
2424
"csexp" {>= "1.5.0"}
2525
"odoc" {with-doc}
2626
]
2727
dev-repo: "git+https://github.com/ocaml/dune.git"
28+
x-maintenance-intent: ["(latest)"]
2829
build: [
2930
["dune" "subst"] {dev}
3031
["rm" "-rf" "vendor/csexp"]

‎dune-glob.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ homepage: "https://github.com/ocaml/dune"
1010
doc: "https://dune.readthedocs.io/"
1111
bug-reports: "https://github.com/ocaml/dune/issues"
1212
depends: [
13-
"dune" {>= "3.12"}
13+
"dune" {>= "3.18"}
1414
"stdune" {= version}
1515
"dyn"
1616
"ordering"
1717
"dune-private-libs" {= version}
1818
"odoc" {with-doc}
1919
]
2020
dev-repo: "git+https://github.com/ocaml/dune.git"
21+
x-maintenance-intent: ["(latest)"]
2122
build: [
2223
["dune" "subst"] {dev}
2324
["rm" "-rf" "vendor/csexp"]

‎dune-private-libs.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
1717
doc: "https://dune.readthedocs.io/"
1818
bug-reports: "https://github.com/ocaml/dune/issues"
1919
depends: [
20-
"dune" {>= "3.12"}
20+
"dune" {>= "3.18"}
2121
"csexp" {>= "1.5.0"}
2222
"pp" {>= "1.1.0"}
2323
"dyn" {= version}
@@ -26,6 +26,7 @@ depends: [
2626
"odoc" {with-doc}
2727
]
2828
dev-repo: "git+https://github.com/ocaml/dune.git"
29+
x-maintenance-intent: ["(latest)"]
2930
build: [
3031
["dune" "subst"] {dev}
3132
["rm" "-rf" "vendor/csexp"]

‎dune-project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(lang dune 3.12)
1+
(lang dune 3.18)
22
; ^^^^
33
; When changing the version, don't forget to regenerate *.opam files
44
; by running [dune build].

‎dune-rpc-lwt.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ homepage: "https://github.com/ocaml/dune"
99
doc: "https://dune.readthedocs.io/"
1010
bug-reports: "https://github.com/ocaml/dune/issues"
1111
depends: [
12-
"dune" {>= "3.12"}
12+
"dune" {>= "3.18"}
1313
"dune-rpc" {= version}
1414
"csexp" {>= "1.5.0"}
1515
"lwt" {>= "5.6.0"}
1616
"base-unix"
1717
"odoc" {with-doc}
1818
]
1919
dev-repo: "git+https://github.com/ocaml/dune.git"
20+
x-maintenance-intent: ["(latest)"]
2021
build: [
2122
["dune" "subst"] {dev}
2223
["rm" "-rf" "vendor/csexp"]

‎dune-rpc.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
99
doc: "https://dune.readthedocs.io/"
1010
bug-reports: "https://github.com/ocaml/dune/issues"
1111
depends: [
12-
"dune" {>= "3.12"}
12+
"dune" {>= "3.18"}
1313
"csexp"
1414
"ordering"
1515
"dyn"
@@ -19,6 +19,7 @@ depends: [
1919
"odoc" {with-doc}
2020
]
2121
dev-repo: "git+https://github.com/ocaml/dune.git"
22+
x-maintenance-intent: ["(latest)"]
2223
build: [
2324
["dune" "subst"] {dev}
2425
["rm" "-rf" "vendor/csexp"]

0 commit comments

Comments
 (0)