From 440555ba3c208b120661101672e2d4c1efd4aa47 Mon Sep 17 00:00:00 2001 From: kxc-wraikny Date: Mon, 23 Jun 2025 20:42:25 +0900 Subject: [PATCH 1/3] Revert "update dune 3.19.1 (#59)" This reverts commit b649f3cff27cf7e9b86d87d9c57152783335f635. --- ocaml-general/install_ocaml_4.14_packages.sh | 20 +++++++++--------- ocaml-general/install_ocaml_5.1_packages.sh | 22 ++++++++++---------- ocaml-general/install_ocaml_5.3_packages.sh | 22 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ocaml-general/install_ocaml_4.14_packages.sh b/ocaml-general/install_ocaml_4.14_packages.sh index ba443e6..d84e4c7 100755 --- a/ocaml-general/install_ocaml_4.14_packages.sh +++ b/ocaml-general/install_ocaml_4.14_packages.sh @@ -1,7 +1,7 @@ #!/bin/bash -xe packages=( - dune.3.19.1 + dune.3.17.2 merlin odoc.2.4.4 ppxlib.0.35.0 @@ -25,15 +25,15 @@ packages=( ) pins=( - dune 3.19.1 - dune-action-plugin 3.19.1 - dune-build-info 3.19.1 - dune-configurator 3.19.1 - dune-glob 3.19.1 - dune-private-libs 3.19.1 - dune-rpc 3.19.1 - dune-rpc-lwt 3.19.1 - dune-site 3.19.1 + dune 3.17.2 + dune-action-plugin 3.17.2 + dune-build-info 3.17.2 + dune-configurator 3.17.2 + dune-glob 3.17.2 + dune-private-libs 3.17.2 + dune-rpc 3.17.2 + dune-rpc-lwt 3.17.2 + dune-site 3.17.2 ) echo "${pins[@]}" | xargs -n 2 opam pin -n add diff --git a/ocaml-general/install_ocaml_5.1_packages.sh b/ocaml-general/install_ocaml_5.1_packages.sh index dc3a2a5..940d9d6 100755 --- a/ocaml-general/install_ocaml_5.1_packages.sh +++ b/ocaml-general/install_ocaml_5.1_packages.sh @@ -1,8 +1,8 @@ #!/bin/bash -xe packages=( - dune.3.19.1 - dune-build-info.3.19.1 + dune.3.17.2 + dune-build-info.3.17.2 merlin odoc.2.4.4 ppxlib.0.35.0 @@ -30,15 +30,15 @@ packages=( ) pins=( - dune 3.19.1 - dune-action-plugin 3.19.1 - dune-build-info 3.19.1 - dune-configurator 3.19.1 - dune-glob 3.19.1 - dune-private-libs 3.19.1 - dune-rpc 3.19.1 - dune-rpc-lwt 3.19.1 - dune-site 3.19.1 + dune 3.17.2 + dune-action-plugin 3.17.2 + dune-build-info 3.17.2 + dune-configurator 3.17.2 + dune-glob 3.17.2 + dune-private-libs 3.17.2 + dune-rpc 3.17.2 + dune-rpc-lwt 3.17.2 + dune-site 3.17.2 ) echo "${pins[@]}" | xargs -n 2 opam pin -n add diff --git a/ocaml-general/install_ocaml_5.3_packages.sh b/ocaml-general/install_ocaml_5.3_packages.sh index 098db97..b31a5af 100755 --- a/ocaml-general/install_ocaml_5.3_packages.sh +++ b/ocaml-general/install_ocaml_5.3_packages.sh @@ -1,8 +1,8 @@ #!/bin/bash -xe packages=( - dune.3.19.1 - dune-build-info.3.19.1 + dune.3.17.2 + dune-build-info.3.17.2 merlin odoc.2.4.4 ppxlib.0.35.0 @@ -30,15 +30,15 @@ packages=( ) pins=( - dune 3.19.1 - dune-action-plugin 3.19.1 - dune-build-info 3.19.1 - dune-configurator 3.19.1 - dune-glob 3.19.1 - dune-private-libs 3.19.1 - dune-rpc 3.19.1 - dune-rpc-lwt 3.19.1 - dune-site 3.19.1 + dune 3.17.2 + dune-action-plugin 3.17.2 + dune-build-info 3.17.2 + dune-configurator 3.17.2 + dune-glob 3.17.2 + dune-private-libs 3.17.2 + dune-rpc 3.17.2 + dune-rpc-lwt 3.17.2 + dune-site 3.17.2 ) echo "${pins[@]}" | xargs -n 2 opam pin -n add From cb101353e428379e621468cd52f4406e425a3e47 Mon Sep 17 00:00:00 2001 From: kxc-wraikny Date: Mon, 23 Jun 2025 21:13:16 +0900 Subject: [PATCH 2/3] add opam archive --- ocaml-general/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-general/Dockerfile b/ocaml-general/Dockerfile index 800bdb2..306f560 100644 --- a/ocaml-general/Dockerfile +++ b/ocaml-general/Dockerfile @@ -40,6 +40,7 @@ RUN bun install -g n yarn && n install $NODE_VERSION RUN bash -c "mkdir opam-tmp && cd opam-tmp && sh <(curl -fsSL https://opam.ocaml.org/install.sh) --download-only && find . && install opam-* /usr/local/bin/opam && cd .. && rm -rf opam-tmp" ## opam switch setup +RUN opam repository add --all-switches --set-default archive git+https://github.com/ocaml/opam-repository-archive RUN opam init --auto-setup --yes --bare --disable-sandboxing RUN opam update RUN opam switch create $OCAML_VERSION From 372db2dbb790feb05a3c2ec900028c78b5e7a297 Mon Sep 17 00:00:00 2001 From: kxc-wraikny Date: Mon, 23 Jun 2025 21:21:57 +0900 Subject: [PATCH 3/3] fix --- ocaml-general/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-general/Dockerfile b/ocaml-general/Dockerfile index 306f560..fa2a6f6 100644 --- a/ocaml-general/Dockerfile +++ b/ocaml-general/Dockerfile @@ -40,8 +40,8 @@ RUN bun install -g n yarn && n install $NODE_VERSION RUN bash -c "mkdir opam-tmp && cd opam-tmp && sh <(curl -fsSL https://opam.ocaml.org/install.sh) --download-only && find . && install opam-* /usr/local/bin/opam && cd .. && rm -rf opam-tmp" ## opam switch setup -RUN opam repository add --all-switches --set-default archive git+https://github.com/ocaml/opam-repository-archive RUN opam init --auto-setup --yes --bare --disable-sandboxing +RUN opam repository add --all-switches --set-default archive git+https://github.com/ocaml/opam-repository-archive RUN opam update RUN opam switch create $OCAML_VERSION