Merge pull request ocaml#5412 from kit-ty-kate/spdx-3.19

Upgrade spdx_licenses to 1.2.0
rjbou · Jan 17, 2023 · 63b9b93 · 63b9b93
2 parents a9033bf + 9c3a3bb
commit 63b9b93
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/scripts/main/hygiene.sh b/.github/scripts/main/hygiene.sh
@@ -104,7 +104,7 @@ if git diff --quiet --exit-code .github/workflows/main.yml ; then
   (set +x; echo "Workflows up-to-date") 2>/dev/null
 else
   (set +x; echo -e "[\e[31mERROR\e[0m] Workflows are out-of-date - \
-please run ocaml ../scripts/ci.ml from .github/workflows and fixup the commit") 2>/dev/null
+please run dune exec --root=. -- ./ci.exe from .github/workflows and fixup the commit") 2>/dev/null
   ERROR=1
 fi
 (set +x ; echo -en "::endgroup::check workflow generation\r") 2>/dev/null

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

diff --git a/master_changes.md b/master_changes.md
@@ -244,6 +244,7 @@ users)
   * Upgrade the vendored dune to 3.5.0 to fix make cold in an OCaml 5.0 env [#5355 @kit-ty-kate]
   * Upgrade vendored deps to support lib-ext in OCaml 5.0 [#5355 @kit-ty-kate / @dra27]
   * Remove unused variable in opamACL.c [#5403 @purplearmadillo77]
+  * Upgrade spdx_licenses to 1.2.0 [#5412 @kit-ty-kate]
 
 ## Infrastructure
   * Fix caching of Cygwin compiler on AppVeyor [#4988 @dra27]

diff --git a/src_ext/Makefile.sources b/src_ext/Makefile.sources
@@ -86,8 +86,8 @@ MD5_stdlib-shims = 09db7af8b4a3a96048a61cb6ae2496ef
 
 $(call PKG_SAME,stdlib-shims)
 
-URL_spdx_licenses = https://github.com/kit-ty-kate/spdx_licenses/releases/download/v1.1.0/spdx_licenses-v1.1.0.tbz
-MD5_spdx_licenses = af8493759aa35b629a324caa3f5ced65
+URL_spdx_licenses = https://github.com/kit-ty-kate/spdx_licenses/releases/download/v1.2.0/spdx_licenses-v1.2.0.tar.gz
+MD5_spdx_licenses = b581124aeebd7facb856d8b942cb58a5
 
 $(call PKG_SAME,spdx_licenses)