From 21da0fb0d2ae44f68db36753d8e9fdfc3b40fe0e Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Wed, 9 Nov 2022 14:26:50 +0100 Subject: [PATCH 1/4] Manifest: fix version constraints Those constraints were discovered when trying to release Octez v15.0 on opam. --- manifest/main.ml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 66fe6814cfdf..d1056a54e241 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -94,7 +94,7 @@ let bls12_381_signature = external_lib ~js_compatible:true "bls12-381-signature" version let bls12_381_polynomial = - let version = V.at_least "0.1.0" in + let version = V.at_least "0.1.3" in external_lib ~js_compatible:false "tezos-bls12-381-polynomial" version let camlzip = external_lib "camlzip" V.(at_least "1.11" && less_than "1.12") @@ -179,10 +179,10 @@ let ipaddr = let ipaddr_unix = external_sublib ipaddr "ipaddr.unix" -let irmin = external_lib "irmin" V.(at_least "3.4.0" && less_than "3.5.0") +let irmin = external_lib "irmin" V.(at_least "3.4.3" && less_than "3.5.0") let irmin_pack = - external_lib "irmin-pack" V.(at_least "3.4.0" && less_than "3.5.0") + external_lib "irmin-pack" V.(at_least "3.4.3" && less_than "3.5.0") let irmin_pack_unix = external_sublib irmin_pack "irmin-pack.unix" @@ -311,7 +311,11 @@ let resto_cohttp_server = external_lib "resto-cohttp-server" resto_version let resto_directory = external_lib ~js_compatible:true "resto-directory" resto_version -let ringo = external_lib ~js_compatible:true "ringo" V.(at_least "0.9") +let ringo = + external_lib + ~js_compatible:true + "ringo" + V.(at_least "0.9" && less_than "1.0.0") let ringo_lwt = external_lib "ringo-lwt" V.(at_least "0.9") @@ -411,7 +415,7 @@ let octez_stdlib = ~path:"src/lib_stdlib" ~synopsis:"Tezos: yet-another local-extension of the OCaml standard library" ~deps:[hex; zarith; zarith_stubs_js; lwt; ringo] - ~ocaml:V.(at_least "4.12") + ~ocaml:V.(at_least "4.14") ~js_compatible:true ~inline_tests:ppx_expect @@ -609,7 +613,7 @@ let octez_hacl = "tezos-hacl" ~path:"src/lib_hacl" ~synopsis:"Tezos: thin layer around hacl-star" - ~ocaml:V.(at_least "4.08") + ~ocaml:V.(at_least "4.14") ~deps:[hacl_star; hacl_star_raw; ctypes_stubs_js] ~js_of_ocaml: [ @@ -1131,6 +1135,7 @@ let lazy_containers = ~synopsis: "A collection of lazy containers whose contents is fetched from \ arbitrary backend on-demand" + ~ocaml:V.(at_least "4.14") ~deps:[octez_lwt_result_stdlib; zarith] let _lazy_containers_tests = @@ -1171,6 +1176,7 @@ let octez_webassembly_interpreter = ~extra_authors:["WebAssembly Authors"] ~synopsis:"WebAssembly reference interpreter with tweaks for Tezos" ~dune:Dune.[[S "include_subdirs"; S "unqualified"]] + ~ocaml:V.(at_least "4.14") ~deps:[octez_lwt_result_stdlib; zarith; lazy_containers |> open_] ~preprocess:[pps ppx_deriving_show] @@ -1836,7 +1842,6 @@ let tezos_protocol_environment_sigs = public_lib "tezos-protocol-environment.sigs" ~path:"src/lib_protocol_environment/sigs" - ~ocaml:V.(at_least "4.12") ~deps:[tezos_protocol_environment_sigs_internals] ~flags:(Flags.standard ~nopervasives:true ~nostdlib:true ()) ~dune: @@ -1896,6 +1901,10 @@ preventing the protocols from, say, directly writing to disk. On the other side, it provides the shell with specific call-sites in the protocols. These are the only entry-points into the otherwise black-box protocols.|} + ~ocaml: + V.( + (* Should be in sync with scripts/version.sh *) + at_least "4.14.0" && less_than "4.15") ~deps: [ zarith; @@ -1996,10 +2005,6 @@ let octez_protocol_compiler_lib = "octez-protocol-compiler" ~path:"src/lib_protocol_compiler" ~synopsis:"Tezos: economic-protocol compiler" - ~ocaml: - V.( - (* Should be in sync with scripts/version.sh *) - at_least "4.14.0" && less_than "4.15") ~deps: [ octez_base |> open_ ~m:"TzPervasives"; -- GitLab From f14343dd229687fe480e0d566b1a414fb1cc86de Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Thu, 17 Nov 2022 14:02:11 +0100 Subject: [PATCH 2/4] Manifest: octez-proxy-server is released --- manifest/main.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest/main.ml b/manifest/main.ml index d1056a54e241..96ed62832224 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -5496,6 +5496,7 @@ let _octez_proxy_server = ~path:"src/bin_proxy_server" ~internal_name:"main_proxy_server" ~synopsis:"Octez: `octez-proxy-server` binary" + ~release:true ~deps: ([ octez_base |> open_ ~m:"TzPervasives" |> open_; -- GitLab From 3029452201f5e88be3f767ac5cfb93a08d988850 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Wed, 9 Nov 2022 14:58:41 +0100 Subject: [PATCH 3/4] Manifest: check synopsis passes opam.ci.ocaml.org's lint check --- manifest/manifest.ml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index a02d8b9dc4ef..99dd0dd84248 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -514,6 +514,16 @@ module Opam = struct description; x_opam_monorepo_opam_provided; } = + if synopsis = "" then invalid_arg "Manifest.Opam.pp: empty synopsis" ; + (match synopsis.[0] with + | 'A' .. 'Z' -> () + | _ -> + invalid_arg + ("Manifest.Opam.pp: synopsis must start with a capital letter: " + ^ synopsis)) ; + if synopsis.[String.length synopsis - 1] = '.' then + invalid_arg + ("Manifest.Opam.pp: synopsis cannot end with a period: " ^ synopsis) ; let depopts, depends = List.partition (fun dep -> dep.optional) depends in let depopts, conflicts = (* Opam documentation says this about [depopts]: -- GitLab From 7d0a7775428e718668c403557317bedaa15c8f8f Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Thu, 10 Nov 2022 10:37:54 +0100 Subject: [PATCH 4/4] Manifest: generate --- .gitlab/ci/opam-ci.yml | 19 ++++++++++++------- opam/octez-dal-node.opam | 4 ++-- opam/octez-protocol-compiler.opam | 1 - opam/octez-sc-rollup-node-alpha.opam | 6 +++--- opam/tezos-context.opam | 4 ++-- opam/tezos-crypto-dal.opam | 2 +- opam/tezos-crypto.opam | 2 +- opam/tezos-hacl.opam | 2 +- opam/tezos-layer2-store.opam | 4 ++-- opam/tezos-lazy-containers.opam | 1 + opam/tezos-p2p.opam | 2 +- opam/tezos-protocol-environment.opam | 4 ++-- opam/tezos-stdlib.opam | 4 ++-- opam/tezos-store.opam | 2 +- opam/tezos-webassembly-interpreter.opam | 1 + opam/tezos-workers.opam | 2 +- script-inputs/binaries-for-release | 1 + 17 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.gitlab/ci/opam-ci.yml b/.gitlab/ci/opam-ci.yml index b860b7234d3b..5e31af2dfb19 100644 --- a/.gitlab/ci/opam-ci.yml +++ b/.gitlab/ci/opam-ci.yml @@ -5,8 +5,6 @@ # Ignoring package octez-dal-node, it only contains tests or private targets -# Ignoring package octez-proxy-server, it only contains tests or private targets - # Ignoring package octez-snoop, it only contains tests or private targets # Ignoring package tezos-benchmark-tests, it only contains tests or private targets @@ -328,6 +326,13 @@ opam:octez-protocol-compiler: variables: package: octez-protocol-compiler +opam:octez-proxy-server: + extends: + - .opam_template + - .rules_template__trigger_opam_batch_2 + variables: + package: octez-proxy-server + opam:octez-sc-rollup-client-alpha: extends: - .opam_template @@ -807,7 +812,7 @@ opam:tezos-embedded-protocol-006-PsCARTHA: opam:tezos-embedded-protocol-007-PsDELPH1: extends: - .opam_template - - .rules_template__trigger_opam_batch_3 + - .rules_template__trigger_opam_batch_4 variables: package: tezos-embedded-protocol-007-PsDELPH1 @@ -933,7 +938,7 @@ opam:tezos-expect-helper: opam:tezos-hacl: extends: - .opam_template - - .rules_template__trigger_opam_batch_6 + - .rules_template__trigger_opam_batch_7 variables: package: tezos-hacl @@ -1199,7 +1204,7 @@ opam:tezos-protocol-demo-noops: opam:tezos-protocol-environment: extends: - .opam_template - - .rules_template__trigger_opam_batch_5 + - .rules_template__trigger_opam_batch_6 variables: package: tezos-protocol-environment @@ -1276,7 +1281,7 @@ opam:tezos-protocol-plugin-011-PtHangz2: opam:tezos-protocol-plugin-011-PtHangz2-registerer: extends: - .opam_template - - .rules_template__trigger_opam_batch_2 + - .rules_template__trigger_opam_batch_3 variables: package: tezos-protocol-plugin-011-PtHangz2-registerer @@ -1444,7 +1449,7 @@ opam:tezos-shell: opam:tezos-shell-benchmarks: extends: - .opam_template - - .rules_template__trigger_opam_batch_4 + - .rules_template__trigger_opam_batch_5 variables: package: tezos-shell-benchmarks diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 25b42e73d19b..5e7f2fcaaff7 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -24,8 +24,8 @@ depends: [ "tezos-dal-node-services" "tezos-layer2-store" "tezos-crypto-dal" - "irmin-pack" { >= "3.4.0" & < "3.5.0" } - "irmin" { >= "3.4.0" & < "3.5.0" } + "irmin-pack" { >= "3.4.3" & < "3.5.0" } + "irmin" { >= "3.4.3" & < "3.5.0" } ] depopts: [ "tezos-dal-alpha" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index 3bd104009352..8aedf5d6dba4 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -9,7 +9,6 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.14.0" & < "4.15" } "tezos-base" "tezos-protocol-environment" "tezos-version" diff --git a/opam/octez-sc-rollup-node-alpha.opam b/opam/octez-sc-rollup-node-alpha.opam index fc64c63c42b1..dd68a350f83b 100644 --- a/opam/octez-sc-rollup-node-alpha.opam +++ b/opam/octez-sc-rollup-node-alpha.opam @@ -28,9 +28,9 @@ depends: [ "tezos-layer2-utils-alpha" "tezos-layer2-store" "data-encoding" { >= "0.6" & < "0.7" } - "irmin-pack" { >= "3.4.0" & < "3.5.0" } - "irmin" { >= "3.4.0" & < "3.5.0" } - "ringo" { >= "0.9" } + "irmin-pack" { >= "3.4.3" & < "3.5.0" } + "irmin" { >= "3.4.3" & < "3.5.0" } + "ringo" { >= "0.9" & < "1.0.0" } "ringo-lwt" { >= "0.9" } "tezos-injector-alpha" "tezos-scoru-wasm" diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 1305b2ec28c7..fda6117109d5 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "tezos-base" "tezos-stdlib" - "irmin" { >= "3.4.0" & < "3.5.0" } - "irmin-pack" { >= "3.4.0" & < "3.5.0" } + "irmin" { >= "3.4.3" & < "3.5.0" } + "irmin-pack" { >= "3.4.3" & < "3.5.0" } "tezos-stdlib-unix" "fmt" { >= "0.8.7" } "bigstringaf" { >= "0.2.0" } diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam index b60a25691e6a..f38fa4e776e8 100644 --- a/opam/tezos-crypto-dal.opam +++ b/opam/tezos-crypto-dal.opam @@ -13,7 +13,7 @@ depends: [ "tezos-error-monad" "data-encoding" { >= "0.6" & < "0.7" } "tezos-crypto" - "tezos-bls12-381-polynomial" { >= "0.1.0" } + "tezos-bls12-381-polynomial" { >= "0.1.3" } "lwt" { >= "5.6.0" } "alcotest" { with-test & >= "1.5.0" } "qcheck-alcotest" { with-test & >= "0.18" } diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index 821ad15dd175..5417531a157c 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -17,7 +17,7 @@ depends: [ "secp256k1-internal" { >= "0.3.0" } "tezos-error-monad" "tezos-rpc" - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "bls12-381" { >= "5.0.0" & < "5.1.0" } diff --git a/opam/tezos-hacl.opam b/opam/tezos-hacl.opam index 41e1e9d63701..34005a777c2d 100644 --- a/opam/tezos-hacl.opam +++ b/opam/tezos-hacl.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.08" } + "ocaml" { >= "4.14" } "hacl-star" { >= "0.4.2" & < "0.5" } "hacl-star-raw" "ctypes_stubs_js" diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index de2f50697c0d..37f1eeaa4eb8 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -10,8 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" - "irmin-pack" { >= "3.4.0" & < "3.5.0" } - "irmin" { >= "3.4.0" & < "3.5.0" } + "irmin-pack" { >= "3.4.3" & < "3.5.0" } + "irmin" { >= "3.4.3" & < "3.5.0" } "tezos-context" ] build: [ diff --git a/opam/tezos-lazy-containers.opam b/opam/tezos-lazy-containers.opam index 50aecee1032e..4f045f4a1452 100644 --- a/opam/tezos-lazy-containers.opam +++ b/opam/tezos-lazy-containers.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "tezos-lwt-result-stdlib" "zarith" { >= "1.12" & < "1.13" } ] diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index 30faab44ff01..a2b327848c03 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "tezos-base" "tezos-stdlib-unix" "tezos-stdlib" diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 0ca4a3fd0f77..b6b5f19af9ca 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -9,7 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.12" } + "ocaml" { >= "4.14.0" & < "4.15" } "tezos-stdlib" "tezos-crypto" "tezos-lwt-result-stdlib" @@ -21,7 +21,7 @@ depends: [ "zarith_stubs_js" "tezos-crypto-dal" "class_group_vdf" { >= "0.0.4" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "ringo-lwt" { >= "0.9" } "tezos-base" "tezos-sapling" diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam index ffabb95f94e4..8c59cff65597 100644 --- a/opam/tezos-stdlib.opam +++ b/opam/tezos-stdlib.opam @@ -9,13 +9,13 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.12" } + "ocaml" { >= "4.14" } "ppx_expect" "hex" { >= "1.3.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "lwt" { >= "5.6.0" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "alcotest" { with-test & >= "1.5.0" } "bigstring" {with-test} "tezos-test-helpers" {with-test} diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 0f3d03af443c..c59a74d38606 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -15,7 +15,7 @@ depends: [ "tezos-validation" "tezos-version" "index" { >= "1.6.0" & < "1.7.0" } - "irmin-pack" { >= "3.4.0" & < "3.5.0" } + "irmin-pack" { >= "3.4.3" & < "3.5.0" } "tezos-protocol-environment" "tezos-context" "tezos-context-ops" diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 528a6de311dc..ad1561422002 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -9,6 +9,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "Apache-2.0" depends: [ "dune" { >= "3.0" } + "ocaml" { >= "4.14" } "ppx_deriving" "tezos-lwt-result-stdlib" "zarith" { >= "1.12" & < "1.13" } diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 07bc821349b8..781772c11b79 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "tezos-stdlib" {with-test} "tezos-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} diff --git a/script-inputs/binaries-for-release b/script-inputs/binaries-for-release index a2345ad139d8..01d33b285685 100644 --- a/script-inputs/binaries-for-release +++ b/script-inputs/binaries-for-release @@ -1,4 +1,5 @@ octez-signer +octez-proxy-server octez-codec octez-client octez-admin-client -- GitLab