Merge pull request #153 from kit-ty-kate/opam-depext-1.2.3

Fix critical issues with release 1.2.2
ocaml-opam · Aug 15, 2024 · 2a457d6 · 2a457d6
2 parents 3f8b78a + 04f4330
commit 2a457d6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.2.3 (2024-08-15):
+* Fix compilation in non-dev mode, broke by #149 (#153 by @kit-ty-kate)
+* Fix constant runtime error, broke by #150 (#153 by @kit-ty-kate)
+
 1.2.2 (2024-08-05):
 * Fix build on bytecode-only systems (#149 by @dra27)
 * Fix opam-depext in the presence of OPAMCOLOR=always (#150 by @kit-ty-kate)

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 all: shell/build.sh
-	cd src_ext && $(MAKE) OCAMLOPT=no bcl
+	cd src_ext && $(MAKE) OCAMLOPT=no
 	sh -ex shell/build.sh
 
 shell/build.sh: shell/build.ml

diff --git a/depext.ml b/depext.ml
@@ -112,11 +112,11 @@ let run_opam f fmt =
   let execute command =
     let opam =
       if is_opam_2_0 () then
-        "opam --color=never "
+        "opam "
       else
-        "opam --color=never --cli=2.1 "
+        "opam --cli=2.1 "
     in
-      f (opam ^ command)
+      f (opam ^ command ^ " --color=never")
   in
     Printf.ksprintf execute fmt
 
@@ -625,7 +625,7 @@ let command =
         with_tests_arg $ with_docs_arg $
         su_arg $ interactive_arg $ opam_args $
         packages_arg),
-  Term.info "opam-depext" ~version:"1.2.2" ~doc ~man
+  Term.info "opam-depext" ~version:"1.2.3" ~doc ~man
 
 let () =
   Sys.catch_break true;

diff --git a/opam b/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "opam-depext"
-version: "1.2.2"
+version: "1.2.3"
 maintainer: [
   "Louis Gesbert <louis.gesbert@ocamlpro.com>"
   "Anil Madhavapeddy <anil@recoil.org>"