diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d86d6888..51c108871 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: ## Please update `scripts/version.sh` accordingly - build_deps_image_version: 4200cbebcae75562d79898a8e11e9f4dc237cc08 + build_deps_image_version: bb57cca4069add53f85f26794971581be8e77e3d build_deps_image_name: registry.gitlab.com/tezos/opam-repository public_docker_image_name: docker.io/${CI_PROJECT_PATH} diff --git a/scripts/update_opam_repo.sh b/scripts/update_opam_repo.sh index f5ffab185..a4b046641 100755 --- a/scripts/update_opam_repo.sh +++ b/scripts/update_opam_repo.sh @@ -86,7 +86,7 @@ cd $tmp_dir git reset --hard "$full_opam_repository_tag" opam admin filter --yes \ - --resolve $packages,ocaml,ocaml-base-compiler,odoc,opam-depext + --resolve $packages,ocaml,ocaml-base-compiler,odoc,opam-depext,js_of_ocaml-ppx ## Adding useful compiler variants for variant in afl flambda fp fp+flambda ; do diff --git a/scripts/version.sh b/scripts/version.sh index 66013c6af..bc09c9003 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -7,7 +7,7 @@ ocaml_version=4.06.1 opam_version=2.0 ## Please update `.gitlab-ci.yml` accordingly -opam_repository_tag=4200cbebcae75562d79898a8e11e9f4dc237cc08 -full_opam_repository_tag=2274027270cc192b88ecd7b9d4035dba66b2cffd +opam_repository_tag=bb57cca4069add53f85f26794971581be8e77e3d +full_opam_repository_tag=a1ce1244a86abf897cacd4692a3ae8c369a18938 opam_repository_url=https://gitlab.com/tezos/opam-repository.git opam_repository=$opam_repository_url\#$opam_repository_tag