Skip to content

Commit 832331a

Browse files
committed
track O1LABS_OPAM_REPOSITORY_COMMIT in scripts/update-opam-switch.sh as well
1 parent 8628a49 commit 832331a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

scripts/update-opam-switch.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ ocaml_version=4.14.2
2929
# - flake.nix (and flake.lock after running
3030
# `nix flake update opam-repository`).
3131
# - scripts/update_opam_switch.sh
32-
opam_repository_commit=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
32+
OPAM_REPOSITORY_COMMIT=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
33+
O1LABS_OPAM_REPOSITORY_COMMIT=cabde639f92d259d4c131b00200d7a53d854ee74
3334

3435
if [[ -d _opam ]]; then
3536
read -rp "Directory '_opam' exists and will be removed. You can also bypass the check by setting the variable BYPASS_OPAM_SWITCH_UPDATE to any value. Continue? [y/N] " \
@@ -48,14 +49,14 @@ if [[ ! -d "${switch_dir}" ]]; then
4849
# We add o1-labs opam repository and make it default
4950
# (if it's repeated, it's a no-op)
5051
opam repository add --yes --set-default o1-labs \
51-
https://github.com/o1-labs/opam-repository.git
52+
"https://github.com/o1-labs/opam-repository.git#${O1LABS_OPAM_REPOSITORY_COMMIT}"
5253
# The default opam repository is set to a specific commit as some of our
5354
# dependencies have been archived.
5455
# See https://github.com/MinaProtocol/mina/pull/17450
5556
opam repository \
5657
set-url \
5758
default \
58-
"git+https://github.com/ocaml/opam-repository.git#${opam_repository_commit}"
59+
"git+https://github.com/ocaml/opam-repository.git#${OPAM_REPOSITORY_COMMIT}"
5960
opam update
6061
opam switch import -y --switch . opam.export
6162
mkdir -p opam_switches

0 commit comments

Comments
 (0)