From 4fe1b4c26fc2f298922a08be9fc519324f855143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 8 Mar 2023 09:14:07 +0100 Subject: [PATCH 1/2] Fix docs.rs build for nym-vesting-contract and nym-bin-common --- common/bin-common/build.rs | 7 ++++++- contracts/vesting/build.rs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/bin-common/build.rs b/common/bin-common/build.rs index b909ce42c4..bd26c886d2 100644 --- a/common/bin-common/build.rs +++ b/common/bin-common/build.rs @@ -4,5 +4,10 @@ use vergen::{vergen, Config}; fn main() { - vergen(Config::default()).expect("failed to extract build metadata") + let mut config = Config::default(); + if std::env::var("DOCS_RS").is_ok() { + // If we don't have access to git information, such as in a docs.rs build, don't error + *config.git_mut().skip_if_error_mut() = true; + } + vergen(config).expect("failed to extract build metadata"); } diff --git a/contracts/vesting/build.rs b/contracts/vesting/build.rs index 3567a950a4..dfffaafd59 100644 --- a/contracts/vesting/build.rs +++ b/contracts/vesting/build.rs @@ -9,5 +9,5 @@ fn main() { // If we don't have access to git information, such as in a docs.rs build, don't error *config.git_mut().skip_if_error_mut() = true; } - vergen(Config::default()).expect("failed to extract build metadata") + vergen(config).expect("failed to extract build metadata") } From f3cff902ba3452a0015cf5432fc4f84875e9ba31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 8 Mar 2023 09:21:27 +0100 Subject: [PATCH 2/2] Bump nym-vesting-contract to 1.2.0-pre.1 --- Cargo.lock | 2 +- contracts/vesting/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11e2398e09..deea16daeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4004,7 +4004,7 @@ dependencies = [ [[package]] name = "nym-vesting-contract" -version = "1.2.0-pre.0" +version = "1.2.0-pre.1" dependencies = [ "cosmwasm-std", "cw-storage-plus", diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml index 3ed2e186c9..4c72da5a4e 100644 --- a/contracts/vesting/Cargo.toml +++ b/contracts/vesting/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-vesting-contract" -version = "1.2.0-pre.0" +version = "1.2.0-pre.1" description = "Nym vesting contract" edition = { workspace = true } authors = { workspace = true }