From 8de781f750b779794a366c68dc2b7db429e4c98f Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Wed, 3 Jun 2026 13:08:25 +0200 Subject: [PATCH] fix ci builds --- Cargo.lock | 132 ++--------------------------------- Cargo.toml | 1 - nym-gateway-probe/Cargo.toml | 6 +- nym-gateway-probe/build.rs | 15 ++-- 4 files changed, 17 insertions(+), 137 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fab6eec072..bf2f23f01b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2226,38 +2226,14 @@ dependencies = [ "serde", ] -[[package]] -name = "darling" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" -dependencies = [ - "darling_core 0.20.11", - "darling_macro 0.20.11", -] - [[package]] name = "darling" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core 0.23.0", - "darling_macro 0.23.0", -] - -[[package]] -name = "darling_core" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.117", + "darling_core", + "darling_macro", ] [[package]] @@ -2273,24 +2249,13 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core 0.20.11", - "quote", - "syn 2.0.117", -] - [[package]] name = "darling_macro" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.23.0", + "darling_core", "quote", "syn 2.0.117", ] @@ -2475,37 +2440,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn 2.0.117", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -6012,7 +5946,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "utoipa", - "vergen 8.3.1", + "vergen", ] [[package]] @@ -6399,7 +6333,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "utoipa", - "vergen 8.3.1", + "vergen", ] [[package]] @@ -6982,7 +6916,7 @@ dependencies = [ "tracing-subscriber", "url", "utoipa", - "vergen-gitcl", + "vergen", ] [[package]] @@ -11315,7 +11249,7 @@ version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ - "darling 0.23.0", + "darling", "proc-macro2", "quote", "syn 2.0.117", @@ -13836,58 +13770,6 @@ dependencies = [ "time", ] -[[package]] -name = "vergen" -version = "9.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b849a1f6d8639e8de261e81ee0fc881e3e3620db1af9f2e0da015d4382ceaf75" -dependencies = [ - "anyhow", - "cargo_metadata 0.23.1", - "derive_builder", - "regex", - "rustc_version 0.4.1", - "rustversion", - "time", - "vergen-lib 9.1.0", -] - -[[package]] -name = "vergen-gitcl" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9dfc1de6eb2e08a4ddf152f1b179529638bedc0ea95e6d667c014506377aefe" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", - "time", - "vergen 9.1.0", - "vergen-lib 0.1.6", -] - -[[package]] -name = "vergen-lib" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", -] - -[[package]] -name = "vergen-lib" -version = "9.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34a29ba7e9c59e62f229ae1932fb1b8fb8a6fdcc99215a641913f5f5a59a569" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", -] - [[package]] name = "version_check" version = "0.9.5" diff --git a/Cargo.toml b/Cargo.toml index 7029cbb322..8362d96700 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -407,7 +407,6 @@ utoipa-swagger-ui = "9.0.2" utoipauto = "0.2" uuid = "1.19.0" vergen = { version = "=8.3.1", default-features = false } -vergen-gitcl = { version = "1.0.8", default-features = false } walkdir = "2" x25519-dalek = "2.0.0" zeroize = "1.7.0" diff --git a/nym-gateway-probe/Cargo.toml b/nym-gateway-probe/Cargo.toml index d7db904a5c..d731935b18 100644 --- a/nym-gateway-probe/Cargo.toml +++ b/nym-gateway-probe/Cargo.toml @@ -75,11 +75,7 @@ test-utils = [] [build-dependencies] anyhow = { workspace = true } -vergen-gitcl = { workspace = true, default-features = false, features = [ - "build", - "cargo", - "rustc", -] } +vergen = { workspace = true, features = ["build", "git", "gitcl", "rustc", "cargo"] } [package.metadata.cargo-machete] ignored = ["vergen", "nym-http-api-client"] diff --git a/nym-gateway-probe/build.rs b/nym-gateway-probe/build.rs index e1947f2277..50468ee8cc 100644 --- a/nym-gateway-probe/build.rs +++ b/nym-gateway-probe/build.rs @@ -5,18 +5,21 @@ use anyhow::{Context, bail}; use std::{path::PathBuf, process::Command}; -use vergen_gitcl::{BuildBuilder, CargoBuilder, Emitter, GitclBuilder, RustcBuilder}; +use vergen::EmitBuilder; fn main() -> anyhow::Result<()> { build_go()?; generate_exit_policy_ports()?; - Emitter::default() - .add_instructions(&BuildBuilder::all_build()?)? - .add_instructions(&CargoBuilder::all_cargo()?)? - .add_instructions(&GitclBuilder::all_git()?)? - .add_instructions(&RustcBuilder::all_rustc()?)? + EmitBuilder::builder() + .all_build() + .all_git() + .all_rustc() + .all_cargo() .emit() + .context("failed to extract build metadata")?; + + Ok(()) } /// Parse PORT_MAPPINGS from network-tunnel-manager.sh and generate a sorted