Opam: use updated build deps

This commit is contained in:
Grégoire Henry 2019-01-21 17:08:46 +01:00
parent dbf4736e6b
commit b2844ff89f
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
variables: variables:
## Please update `scripts/version.sh` accordingly ## 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 build_deps_image_name: registry.gitlab.com/tezos/opam-repository
public_docker_image_name: docker.io/${CI_PROJECT_PATH} public_docker_image_name: docker.io/${CI_PROJECT_PATH}

View File

@ -86,7 +86,7 @@ cd $tmp_dir
git reset --hard "$full_opam_repository_tag" git reset --hard "$full_opam_repository_tag"
opam admin filter --yes \ 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 ## Adding useful compiler variants
for variant in afl flambda fp fp+flambda ; do for variant in afl flambda fp fp+flambda ; do

View File

@ -7,7 +7,7 @@ ocaml_version=4.06.1
opam_version=2.0 opam_version=2.0
## Please update `.gitlab-ci.yml` accordingly ## Please update `.gitlab-ci.yml` accordingly
opam_repository_tag=4200cbebcae75562d79898a8e11e9f4dc237cc08 opam_repository_tag=bb57cca4069add53f85f26794971581be8e77e3d
full_opam_repository_tag=2274027270cc192b88ecd7b9d4035dba66b2cffd full_opam_repository_tag=a1ce1244a86abf897cacd4692a3ae8c369a18938
opam_repository_url=https://gitlab.com/tezos/opam-repository.git opam_repository_url=https://gitlab.com/tezos/opam-repository.git
opam_repository=$opam_repository_url\#$opam_repository_tag opam_repository=$opam_repository_url\#$opam_repository_tag