From 44a0b6a7b816f1d0bd868aac243a90e8881eb251 Mon Sep 17 00:00:00 2001 From: zie1ony Date: Wed, 19 Jul 2023 15:07:07 +0200 Subject: [PATCH 1/5] Update version to 0.0.10 --- CHANGELOG.md | 2 ++ Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f301df7..7b5454b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ Changelog for `cargo-odra`. +## [0.0.10] - 2023-XX-XX + ## [0.0.9] - 2023-07-19 ### Added diff --git a/Cargo.toml b/Cargo.toml index b503d91..9785bef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ description = "A cargo utility that helps to create, manage and test your smart keywords = ["wasm", "webassembly", "blockchain"] categories = ["wasm", "smart contracts"] name = "cargo-odra" -version = "0.0.9" +version = "0.0.10" edition = "2021" [dependencies] From 4d835e23bdba96cf4ecc0cbc7b661d998c9bc9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 13 Dec 2023 11:14:11 +0100 Subject: [PATCH 2/5] Fix grabbing latest version when generating a prject. --- rust-toolchain | 2 +- src/project.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index 101ae3a..b27a258 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-03-01 \ No newline at end of file +nightly-2023-04-20 diff --git a/src/project.rs b/src/project.rs index 96917f3..432d428 100644 --- a/src/project.rs +++ b/src/project.rs @@ -83,6 +83,8 @@ impl Project { }, }; + dbg!(template_path.clone()); + cargo_generate::generate(GenerateArgs { template_path, list_favorites: false, @@ -399,11 +401,10 @@ impl Project { } fn odra_location(source: Option) -> OdraLocation { - // repo let source = if let Some(source) = source { source } else { - return OdraLocation::Remote(ODRA_TEMPLATE_GH_REPO.to_string(), None); + Self::odra_latest_version() }; // location on disk From 74fedc086e7032f9fee6bc7e9e423a8b3f0e9c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 13 Dec 2023 11:42:01 +0100 Subject: [PATCH 3/5] Fix CI --- justfile | 2 +- src/project.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/justfile b/justfile index 51c8128..a7960a9 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -DEVELOPMENT_ODRA_BRANCH := "release/0.5.0" +DEVELOPMENT_ODRA_BRANCH := "release/0.7.1" default: just --list diff --git a/src/project.rs b/src/project.rs index 432d428..c278e90 100644 --- a/src/project.rs +++ b/src/project.rs @@ -83,8 +83,6 @@ impl Project { }, }; - dbg!(template_path.clone()); - cargo_generate::generate(GenerateArgs { template_path, list_favorites: false, From 73b876854705f50a467909c47e006b26de2314b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 13 Dec 2023 12:03:20 +0100 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5454b..6e4b0fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ Changelog for `cargo-odra`. -## [0.0.10] - 2023-XX-XX +## [0.0.10] - 2023-12-13 + +### Fixed +- Fixed error that caused the template for odra 0.8.0 being downloaded for earlier +versions of odra. ## [0.0.9] - 2023-07-19 From d6eac6ce965110e988195e6fbb182cd141cea02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 13 Dec 2023 12:11:46 +0100 Subject: [PATCH 5/5] Install wasm32 target for testproject during ci --- justfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/justfile b/justfile index a7960a9..2a48845 100644 --- a/justfile +++ b/justfile @@ -21,6 +21,8 @@ test-project-generation-on-future-odra: just test-testproject test-testproject: + cd testproject && rustup target add wasm32-unknown-unknown + cd testproject && rustup component add rustfmt --toolchain nightly-2023-03-01-x86_64-unknown-linux-gnu cd testproject && cargo odra generate -c plascoin cd testproject && cargo odra test cd testproject && cargo odra test -b casper