diff --git a/.github/scripts/bitbucket-test-Cargo.toml b/.github/scripts/cargo-tomls/bitbucket-test-Cargo.toml similarity index 94% rename from .github/scripts/bitbucket-test-Cargo.toml rename to .github/scripts/cargo-tomls/bitbucket-test-Cargo.toml index dd0ff6bd..78a87cd0 100644 --- a/.github/scripts/bitbucket-test-Cargo.toml +++ b/.github/scripts/cargo-tomls/bitbucket-test-Cargo.toml @@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }" [[bin]] name = "cargo-binstall" +path = "src/main.rs" diff --git a/.github/scripts/github-test-Cargo.toml b/.github/scripts/cargo-tomls/github-test-Cargo.toml similarity index 94% rename from .github/scripts/github-test-Cargo.toml rename to .github/scripts/cargo-tomls/github-test-Cargo.toml index c472a060..aa47c496 100644 --- a/.github/scripts/github-test-Cargo.toml +++ b/.github/scripts/cargo-tomls/github-test-Cargo.toml @@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }" [[bin]] name = "cargo-binstall" +path = "src/main.rs" diff --git a/.github/scripts/gitlab-test-Cargo.toml b/.github/scripts/cargo-tomls/gitlab-test-Cargo.toml similarity index 94% rename from .github/scripts/gitlab-test-Cargo.toml rename to .github/scripts/cargo-tomls/gitlab-test-Cargo.toml index feea2041..133866ff 100644 --- a/.github/scripts/gitlab-test-Cargo.toml +++ b/.github/scripts/cargo-tomls/gitlab-test-Cargo.toml @@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }" [[bin]] name = "cargo-binstall" +path = "src/main.rs" diff --git a/.github/scripts/tests.sh b/.github/scripts/tests.sh index 40ee853c..40f09e06 100755 --- a/.github/scripts/tests.sh +++ b/.github/scripts/tests.sh @@ -7,14 +7,15 @@ unset CARGO_HOME # Install binaries using cargo-binstall # shellcheck disable=SC2086 -"./$1" binstall --log-level debug --no-confirm b3sum cargo-binstall +"./$1" binstall --log-level debug --no-confirm b3sum cargo-binstall cargo-watch # Test that the installed binaries can be run b3sum --version cargo-binstall --help >/dev/null cargo binstall --help >/dev/null +cargo watch -V -test_resources=".github/scripts" +test_resources=".github/scripts/cargo-tomls" # Install binaries using `--manifest-path` "./$1" binstall --force --log-level debug --manifest-path "$test_resources/gitlab-test-Cargo.toml" --no-confirm cargo-binstall diff --git a/Cargo.lock b/Cargo.lock index 5108ce86..b07937f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -221,9 +221,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aecd74f843e919090741163a59948751f6f57b5a9b3d7a4a4d278e17b6a16cf" +checksum = "c820ea238df9b9054d3401b1d441b4cd6f461646fc55cbc60fabf9d2088b7f3a" dependencies = [ "serde", "toml", diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 3eeef597..834c0cd9 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -13,7 +13,7 @@ license = "GPL-3.0" async-trait = "0.1.57" bytes = "1.2.1" bzip2 = "0.4.3" -cargo_toml = "0.12.0" +cargo_toml = "0.12.1" clap = { version = "3.2.22", features = ["derive"] } compact_str = { version = "0.6.0", features = ["serde"] } crates_io_api = { version = "0.8.1", default-features = false }