From 6a88c0921ba7cc63039ba192885c7da35cf28420 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 27 Feb 2023 15:53:57 +0100 Subject: [PATCH] Manifest: Bump tezos-rust-libs to 1.5 and other updates --- .gitlab-ci.yml | 2 +- manifest/main.ml | 11 ++++------- opam/octez-node.opam | 2 +- opam/tezos-sapling.opam | 2 +- opam/tezos-wasmer.opam | 2 +- opam/virtual/octez-deps.opam | 4 ++-- scripts/version.sh | 4 ++-- src/bin_node/dune | 2 +- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb98e310cb5c..6e4f562d5ed2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR # in GitLab namespaces `nomadic-labs` and `tezos` ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh` - build_deps_image_version: e4d1735d68f34600829a2ba61415714c3c47b051 + build_deps_image_version: c6ef83f7026ccec1a0d332ed7998bd1424b6bb3b build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/manifest/main.ml b/manifest/main.ml index ae3604d4c6aa..903da2645fed 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -329,12 +329,9 @@ let tar = external_lib "tar" V.True let tar_unix = external_lib "tar-unix" V.(at_least "2.0.1" && less_than "3.0.0") let tezos_rust_lib = - opam_only ~can_vendor:false "tezos-rust-libs" V.(exactly "1.4") + opam_only ~can_vendor:false "tezos-rust-libs" V.(exactly "1.5") -let tezos_rust_lib_sapling = - opam_only ~can_vendor:false "tezos-rust-libs" V.(exactly "1.4") - -let tls = external_lib "tls" V.(at_least "0.13.0") +let tls_lwt = external_lib "tls-lwt" V.(at_least "0.16.0") let unix = external_lib ~opam:"base-unix" "unix" V.True @@ -2012,7 +2009,7 @@ let octez_sapling = octez_stdlib |> open_; octez_crypto; octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; - tezos_rust_lib_sapling; + tezos_rust_lib; octez_lwt_result_stdlib; ] ~js_of_ocaml:[[S "javascript_files"; S "runtime.js"]] @@ -5989,7 +5986,7 @@ let _octez_node = cmdliner; fmt_cli; fmt_tty; - tls; + tls_lwt; prometheus_app_unix; lwt_exit; uri; diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 895a18ee1c05..5b428c0cde7e 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -27,7 +27,7 @@ depends: [ "tezos-protocol-updater" "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } - "tls" { >= "0.13.0" } + "tls-lwt" { >= "0.16.0" } "prometheus-app" { >= "1.2" } "lwt-exit" "uri" { >= "3.1.0" } diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index 4dd1d42f3cef..71b1e987b942 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -19,7 +19,7 @@ depends: [ "tezos-stdlib" "tezos-crypto" "tezos-error-monad" - "tezos-rust-libs" { = "1.4" } + "tezos-rust-libs" { = "1.5" } "tezos-lwt-result-stdlib" "tezos-base" {with-test} "tezos-stdlib-unix" {with-test} diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam index 1789f05dd0f4..86cbcdf84e9a 100644 --- a/opam/tezos-wasmer.opam +++ b/opam/tezos-wasmer.opam @@ -14,7 +14,7 @@ depends: [ "ctypes" { >= "0.18.0" } "ctypes-foreign" { >= "0.18.0" } "lwt" { >= "5.6.0" } - "tezos-rust-libs" { = "1.4" } + "tezos-rust-libs" { = "1.5" } ] x-opam-monorepo-opam-provided: [ "tezos-rust-libs" diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 9ddf6a8b1847..89445408556d 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -92,9 +92,9 @@ depends: [ "tar-unix" { >= "2.0.1" & < "3.0.0" } "tezos-plompiler" { >= "1.0.1" & < "2.0.0" } "tezos-plonk" { >= "1.0.1" & < "2.0.0" } - "tezos-rust-libs" { = "1.4" } + "tezos-rust-libs" { = "1.5" } "tezt" { >= "3.0.0" } - "tls" { >= "0.13.0" } + "tls-lwt" { >= "0.16.0" } "uri" { >= "3.1.0" } "uutf" "zarith" { >= "1.12" & < "1.13" } diff --git a/scripts/version.sh b/scripts/version.sh index 0ad13622edf3..d684e6af5702 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -20,12 +20,12 @@ export recommended_node_version=16.18.1 ## full_opam_repository is a commit hash of the public OPAM repository, i.e. ## https://github.com/ocaml/opam-repository -export full_opam_repository_tag=59abe7be7457eed1c245c61034a50a1551f235ed +export full_opam_repository_tag=7f0579750a745ea92dc2fe3869d491902e2c29dd ## opam_repository is an additional, tezos-specific opam repository. ## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.yml export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag="${OPAM_REPOSITORY_TAG:-e4d1735d68f34600829a2ba61415714c3c47b051}" +export opam_repository_tag="${OPAM_REPOSITORY_TAG:-c6ef83f7026ccec1a0d332ed7998bd1424b6bb3b}" export opam_repository_git="$opam_repository_url.git" export opam_repository="$opam_repository_git"\#"$opam_repository_tag" diff --git a/src/bin_node/dune b/src/bin_node/dune index 8d1b26306d67..5955bc65d448 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -28,7 +28,7 @@ cmdliner fmt.cli fmt.tty - tls + tls-lwt prometheus-app.unix lwt-exit uri -- GitLab