Merge branch 'main' into gh-489

* main: update dune to latest (#540)
melange-re · Apr 11, 2023 · 8238d8b · 8238d8b
2 parents f6acce2 + dd000c2
commit 8238d8b
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/esy-build.yml b/.github/workflows/esy-build.yml
@@ -59,7 +59,7 @@ jobs:
         if: ${{ matrix.system == 'ubuntu' }}
         working-directory: melange-basic-template
         run: |
-          sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#21914b91f66a94e2cae33b9b19ea1521b6104d8a", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/mel": "melange-re/melange:mel.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json
+          sed -i 's@"installConfig"@"resolutions": { "\@opam/dune": "ocaml/dune:dune.opam#258058c6803525261df9d330d9eca2a4b0a8adc2", "\@opam/melange-compiler-libs": "melange-re/melange-compiler-libs:melange-compiler-libs.opam#7263bea2285499f5da857f2bb374345a5178791e", "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/mel": "melange-re/melange:mel.opam#'"$GITHUB_SHA"'"},"installConfig"@' esy.json
 
       - name: Build basic template
         if: ${{ matrix.system == 'ubuntu' }}

diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ opam-create-switch: ## Create opam switch
 
 .PHONY: opam-install-test
 opam-install-test: ## Install test dependencies
-	opam pin -y add dune.dev https://github.com/ocaml/dune.git#21914b91f66a94e2cae33b9b19ea1521b6104d8a
+	opam pin -y add dune.dev https://github.com/ocaml/dune.git#258058c6803525261df9d330d9eca2a4b0a8adc2
 	opam pin -y add melange-compiler-libs.dev https://github.com/melange-re/melange-compiler-libs.git#7263bea2285499f5da857f2bb374345a5178791e
 	opam pin add reactjs-jsx-ppx.dev . --with-test -y
 	opam pin add melange.dev . --with-test -y

diff --git a/flake.nix b/flake.nix
@@ -31,8 +31,8 @@
                   src = super.fetchFromGitHub {
                     owner = "ocaml";
                     repo = "dune";
-                    rev = "4245029f2914bcfdca915e9916a5155a0afa95fb";
-                    hash = "sha256-yNQc1X3MQ93a1fLccDcFgiJN/0W2u1DfV48CZXbucpc=";
+                    rev = "258058c6803525261df9d330d9eca2a4b0a8adc2";
+                    hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w=";
                   };
                 });
               });

diff --git a/nix/ci/test.nix b/nix/ci/test.nix
@@ -21,8 +21,8 @@ let
             src = super.fetchFromGitHub {
               owner = "ocaml";
               repo = "dune";
-              rev = "4245029f2914bcfdca915e9916a5155a0afa95fb";
-              hash = "sha256-yNQc1X3MQ93a1fLccDcFgiJN/0W2u1DfV48CZXbucpc=";
+              rev = "258058c6803525261df9d330d9eca2a4b0a8adc2";
+              hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w=";
             };
           });
 

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -9,8 +9,8 @@ final: prev:
         src = prev.fetchFromGitHub {
           owner = "ocaml";
           repo = "dune";
-          rev = "649031728346482a83441c26c0bbe06ecd89cce2";
-          hash = "sha256-IbvAumstRp7JE+UQDArrwYWyZtbe8q8bZo05eVzA/MU=";
+          rev = "258058c6803525261df9d330d9eca2a4b0a8adc2";
+          hash = "sha256-cbwnAY0G9OLtm6k6mhBLxuJ6wMbqhEsUvUgtIfHLZ8w=";
         };
       });
     })).overrideScope' (oself: osuper:

diff --git a/test/belt-and-runtime.t b/test/belt-and-runtime.t
@@ -18,6 +18,7 @@ Try commonjs first
   >  (target melange)
   >  (alias melange)
   >  (libraries melange)
+  >  (emit_stdlib false)
   >  (module_systems commonjs))
   > EOF
 
@@ -35,6 +36,7 @@ Now es6
   >  (target melange)
   >  (alias melange)
   >  (libraries melange)
+  >  (emit_stdlib false)
   >  (module_systems es6))
   > EOF
 

diff --git a/test/dune-js-file-unmangling.t/dune b/test/dune-js-file-unmangling.t/dune
@@ -2,4 +2,5 @@
  (target dist)
  (alias melange-dist)
  (modules entry_module)
+ (emit_stdlib false)
  (libraries parent))
diff --git a/test/dune-melange-mode-unwrapped.t/dune b/test/dune-melange-mode-unwrapped.t/dune
@@ -2,4 +2,5 @@
  (target dist)
  (alias melange-dist)
  (module_systems es6)
+ (emit_stdlib false)
  (libraries b))
diff --git a/test/dune-melange-mode.t/dune b/test/dune-melange-mode.t/dune
@@ -2,4 +2,5 @@
  (target dist)
  (alias melange-dist)
  (module_systems es6)
+ (emit_stdlib false)
  (libraries b))
diff --git a/test/missing-namespace.t/dune b/test/missing-namespace.t/dune
@@ -1,4 +1,5 @@
 (melange.emit
  (target dist)
  (alias melange-dist)
+ (emit_stdlib false)
  (libraries melange))
diff --git a/test/print-exn.t b/test/print-exn.t
@@ -19,6 +19,7 @@ An example that uses exceptions runtime
   > (melange.emit
   >  (target melange)
   >  (alias melange)
+  >  (emit_stdlib false)
   >  (libraries melange))
   > EOF
   $ dune build @melange

diff --git a/test/react.t b/test/react.t
@@ -10,6 +10,7 @@ Demonstrate how to use the React JSX PPX
   >  (target output)
   >  (alias mel)
   >  (compile_flags :standard -w -20)
+  >  (emit_stdlib false)
   >  (preprocess (pps reactjs-jsx-ppx)))
   > EOF
   $ cat > x.re <<EOF

diff --git a/test/shadow-internal-lib.t/dune b/test/shadow-internal-lib.t/dune
@@ -2,4 +2,5 @@
  (target dist)
  (alias melange-dist)
  (modules entry_module)
+ (emit_stdlib false)
  (libraries node))
diff --git a/test/shadow-internal-module.t/dune b/test/shadow-internal-module.t/dune
@@ -2,4 +2,5 @@
  (target dist)
  (alias melange-dist)
  (modules entry_module)
+ (emit_stdlib false)
  (libraries node))
diff --git a/test/stack-module.t b/test/stack-module.t
@@ -25,6 +25,7 @@ Building when library is unwrapped breaks
   > (melange.emit
   >  (target melange)
   >  (alias mel)
+  >  (emit_stdlib false)
   >  (modules)
   >  (libraries foo))
   > EOF