Merge pull request #12608 from Alizter/push-lkmtslrurvxl

chore: bump dune lang

Author: Alizter

.github/workflows/oxcaml.yml

@@ -28,11 +28,11 @@ jobs:
             default: "git+https://github.com/ocaml/opam-repository.git"
           opam-pin: false
 
-      - name: Install deps
-        run: |
-          opam pin add . -n --with-version=3.20.2+ox
-          opam install . --deps-only
-          opam install re spawn uutf
+      - name: Pin deps 
+        run: opam pin add -n . --with-version=3.20.2+ox
+
+      - name: Install deps 
+        run: opam install re spawn uutf ./dune.opam
 
       - name: Build dune
         run: opam exec -- make bootstrap

.github/workflows/workflow.yml

@@ -217,7 +217,7 @@ jobs:
 
       # Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
       - run: |
-          opam pin -n . --with-version=3.20
+          opam pin -n .
           opam install ./dune.opam --deps-only
 
       - name: Install system deps on macOS
@@ -347,7 +347,9 @@ jobs:
       - name: Create an empty switch
         run: opam switch create . --empty
       - name: Pin local packages to local dependencies
-        run: opam pin add . -n --with-version=dev
+        run: opam pin add . -n --with-version=3.21.0
+        #                                     ^^^^^^
+        # When updating dune lang, update this too
       - name: Install external dependencies
         run: opam install .
 

chrome-trace.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

dune-action-plugin.opam

@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "dune-glob" {= version}
   "csexp" {>= "1.5.0"}
   "ppx_expect" {with-test}

dune-build-info.opam

@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

dune-configurator.opam

@@ -18,7 +18,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "csexp" {>= "1.5.0"}

dune-glob.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "stdune" {= version}
   "dyn"
   "re"

dune-private-libs.opam

@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "csexp" {>= "1.5.0"}
   "pp" {>= "1.1.0"}
   "dyn" {= version}

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.20)
+(lang dune 3.21)
 ;          ^^^^
 ; When changing the version, don't forget to regenerate *.opam files
 ; by running [dune build].

dune-rpc-lwt.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.20"}
+  "dune" {>= "3.21"}
   "dune-rpc" {= version}
   "csexp" {>= "1.5.0"}
   "lwt" {>= "5.6.0"}