From 3ba697af03616d94ce977189d9fb233cbfdc5634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Mon, 26 Feb 2024 13:31:41 +0100 Subject: [PATCH] Enabled tests on development version of Odra --- .github/workflows/ci-cargo-odra.yml | 4 ++-- justfile | 2 +- src/actions/init.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cargo-odra.yml b/.github/workflows/ci-cargo-odra.yml index a37880a..8e16ba9 100644 --- a/.github/workflows/ci-cargo-odra.yml +++ b/.github/workflows/ci-cargo-odra.yml @@ -32,7 +32,7 @@ jobs: - run: just prepare - run: just check-lint - run: just install -# - run: just test-project-generation-on-future-odra -# - run: just test-workspace-generation-on-future-odra + - run: just test-project-generation-on-future-odra + - run: just test-workspace-generation-on-future-odra - run: just test-project-generation-on-stable-odra - run: just test-workspace-generation-on-stable-odra diff --git a/justfile b/justfile index 34f6ac4..3706dc2 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -DEVELOPMENT_ODRA_BRANCH := "release/0.8.0" +DEVELOPMENT_ODRA_BRANCH := "release/0.9.0" BINARYEN_VERSION := "version_116" BINARYEN_CHECKSUM := "c55b74f3109cdae97490faf089b0286d3bba926bb6ea5ed00c8c784fc53718fd" diff --git a/src/actions/init.rs b/src/actions/init.rs index b9add43..8dcefab 100644 --- a/src/actions/init.rs +++ b/src/actions/init.rs @@ -1,6 +1,6 @@ //! Module responsible for initializing an Odra project. -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use cargo_generate::{GenerateArgs, TemplatePath, Vcs}; use cargo_toml::{Dependency, DependencyDetail}; @@ -133,12 +133,12 @@ impl InitAction { fn replace_package_placeholder( init: bool, odra_location: &OdraLocation, - cargo_toml_path: &PathBuf, + cargo_toml_path: &Path, placeholder: &str, crate_name: &str, ) { replace_in_file( - cargo_toml_path.clone(), + cargo_toml_path.to_path_buf(), placeholder, format!( "{} = {{ {} }}",