diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8a4f7db51cb7d4ff9d97c21d4ee738bc8cd1e46..b8de4ebed9a2afdac46481dadda94c7f5b1324b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: variables: ## Please update `scripts/version.sh` accordingly - build_deps_image_version: a9386c8127e4239726d5ba8e198152f2b70845c5 + build_deps_image_version: 5554281d9e3a226cf98b0c9e8721afad2973c150 build_deps_image_name: registry.gitlab.com/tezos/opam-repository public_docker_image_name: docker.io/${CI_PROJECT_PATH} GIT_STRATEGY: fetch diff --git a/scripts/version.sh b/scripts/version.sh index 01b4af790948c196a25afc75712e2c117aeb234d..c0ed1c860256eb648d37b079eb1e7f6602b43e30 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -10,10 +10,10 @@ recommended_rust_version=1.44.0 ## Please update `.gitlab-ci.yml` accordingly ## full_opam_repository is a commit hash of the public OPAM repository, i.e. ## https://github.com/ocaml/opam-repository -full_opam_repository_tag=b3ff02afce0526d4cec91b32bd7b59c1550440ea +full_opam_repository_tag=eb6f20daffff6dc5c67b4b55b87bf6b0e600c4d7 ## opam_repository is an additional, tezos-specific opam repository. -opam_repository_tag=a9386c8127e4239726d5ba8e198152f2b70845c5 +opam_repository_tag=5554281d9e3a226cf98b0c9e8721afad2973c150 opam_repository_url=https://gitlab.com/tezos/opam-repository.git opam_repository=$opam_repository_url\#$opam_repository_tag diff --git a/src/tooling/tezos-tooling.opam b/src/tooling/tezos-tooling.opam index 71747785c49a796131284da42d10f01a846afec4..c069c731fa452b93d123d4a9fd7bbacd49fe85bc 100644 --- a/src/tooling/tezos-tooling.opam +++ b/src/tooling/tezos-tooling.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "coq-of-ocaml" { = "2.4.0" } + "coq-of-ocaml" { = "2.4.1" } "dune" { >= "2.0" } "ocamlformat" { = "0.10" } "bisect_ppx" { >= "2.3" } diff --git a/vendors/ocaml-bls12-381/bls12-381.opam b/vendors/ocaml-bls12-381/bls12-381.opam index fe65d1325639b349906e6c6345ef0bd2a165267c..cb42f39a0a81ab70144c1192693dd4133583399c 100644 --- a/vendors/ocaml-bls12-381/bls12-381.opam +++ b/vendors/ocaml-bls12-381/bls12-381.opam @@ -15,8 +15,8 @@ depends: [ "dune-configurator" {build} "ff" {>= "0.4.0" & < "0.5.0"} "zarith" {>= "1.10" & < "2.0"} - "ctypes" {= "0.17.1"} - "ctypes-foreign" {= "0.4.0"} + "ctypes" {>= "0.18.0" & < "0.19.0"} + "ctypes-foreign" "alcotest" {with-test} ] build: [[ "dune" "build" "-j" jobs "-p" name "@install" ]]