Upgrade to mccs.1.1+17

kit-ty-kate · Dec 21, 2023 · 2ad6690 · 2ad6690
1 parent 2592c14
commit 2ad6690
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml
@@ -470,8 +470,8 @@ let main oc : unit =
     ("OPAM12CACHE", "~/.cache/opam1.2/cache");
     (* These should be identical to the values in appveyor.yml *)
     ("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
-    ("OPAM_TEST_REPO_SHA", "b251e0d9d0a8bcb0742d4d495c70f479effe16c2");
-    ("OPAM_REPO_SHA", "b251e0d9d0a8bcb0742d4d495c70f479effe16c2");
+    ("OPAM_TEST_REPO_SHA", "c687553afb80373165068d67f33512b7ad39e6a3");
+    ("OPAM_REPO_SHA", "c687553afb80373165068d67f33512b7ad39e6a3");
     ("SOLVER", "");
     (* Cygwin configuration *)
     ("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/");

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -42,8 +42,8 @@ env:
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_TEST_REPO_SHA: b251e0d9d0a8bcb0742d4d495c70f479effe16c2
-  OPAM_REPO_SHA: b251e0d9d0a8bcb0742d4d495c70f479effe16c2
+  OPAM_TEST_REPO_SHA: c687553afb80373165068d67f33512b7ad39e6a3
+  OPAM_REPO_SHA: c687553afb80373165068d67f33512b7ad39e6a3
   SOLVER:
   CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
   CYGWIN_ROOT: D:\cygwin

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -347,7 +347,7 @@ AC_CHECK_OCAML_PKG([sha])
 AC_CHECK_OCAML_PKG([swhid_core])
 
 # Optional dependencies
-AC_CHECK_OCAML_PKG_AT_LEAST([mccs],[1.1+9])
+AC_CHECK_OCAML_PKG_AT_LEAST([mccs],[1.1+17])
 
 AS_IF([test "x${with_mccs}" = "xno" && test "x$OCAML_PKG_mccs" != "xno"],
       [AC_MSG_ERROR([Option --without-mccs is not available without uninstalling the 'mccs' package])])

diff --git a/master_changes.md b/master_changes.md
@@ -71,6 +71,8 @@ users)
 ## VCS
 
 ## Build
+  * Vendor mccs.1.1+17 [#5769 @kit-ty-kate]
+  * Require mccs >= 1.1+17 [#5769 @kit-ty-kate]
 
 ## Infrastructure
 
@@ -87,6 +89,7 @@ users)
 ## Opam file format
 
 ## Solver
+  * Fix debug logs showing up regardless of verbosity on macOS 12.7.1 / 13.6.3 / 14.2 and FreeBSD [#5769 @kit-ty-kate]
 
 ## Client
 

diff --git a/opam-solver.opam b/opam-solver.opam
@@ -30,7 +30,7 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "mccs" {>= "1.1+9"}
+  "mccs" {>= "1.1+17"}
   "dose3" {>= "6.1"}
   "cudf" {>= "0.7"}
   "re" {>= "1.9.0"}

diff --git a/src_ext/Makefile.sources b/src_ext/Makefile.sources
@@ -38,8 +38,8 @@ MD5_dose3 = bc99cbcea8fca29dca3ebbee54be45e1
 
 $(call PKG_SAME,dose3)
 
-URL_mccs = https://github.com/AltGr/ocaml-mccs/archive/1.1+14.tar.gz
-MD5_mccs = 9bfa9ff1eb3948403d44521e4e71933a
+URL_mccs = https://github.com/ocaml-opam/ocaml-mccs/archive/refs/tags/1.1+17.tar.gz
+MD5_mccs = 844d99bc531e0713238fe4b6b8511ed1
 
 $(call PKG_SAME,mccs)