Skip to content

Commit ae9f536

Browse files
authored
Fix/dep cargo_toml: Bump to v0.12.1 (rust-lang#418)
* Fix `cargo_toml`: Bump dep to v0.12.1 * Test `cargo-watch` in CI * Fix `*-test-Cargo.toml` used in integration tests Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
1 parent c86cba3 commit ae9f536

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

.github/scripts/bitbucket-test-Cargo.toml renamed to .github/scripts/cargo-tomls/bitbucket-test-Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }"
1313

1414
[[bin]]
1515
name = "cargo-binstall"
16+
path = "src/main.rs"

.github/scripts/github-test-Cargo.toml renamed to .github/scripts/cargo-tomls/github-test-Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }"
1313

1414
[[bin]]
1515
name = "cargo-binstall"
16+
path = "src/main.rs"

.github/scripts/gitlab-test-Cargo.toml renamed to .github/scripts/cargo-tomls/gitlab-test-Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ bin-dir = "{ bin }{ binary-ext }"
1313

1414
[[bin]]
1515
name = "cargo-binstall"
16+
path = "src/main.rs"

.github/scripts/tests.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ unset CARGO_HOME
77

88
# Install binaries using cargo-binstall
99
# shellcheck disable=SC2086
10-
"./$1" binstall --log-level debug --no-confirm b3sum cargo-binstall
10+
"./$1" binstall --log-level debug --no-confirm b3sum cargo-binstall cargo-watch
1111

1212
# Test that the installed binaries can be run
1313
b3sum --version
1414
cargo-binstall --help >/dev/null
1515
cargo binstall --help >/dev/null
16+
cargo watch -V
1617

17-
test_resources=".github/scripts"
18+
test_resources=".github/scripts/cargo-tomls"
1819

1920
# Install binaries using `--manifest-path`
2021
"./$1" binstall --force --log-level debug --manifest-path "$test_resources/gitlab-test-Cargo.toml" --no-confirm cargo-binstall

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/binstalk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license = "GPL-3.0"
1313
async-trait = "0.1.57"
1414
bytes = "1.2.1"
1515
bzip2 = "0.4.3"
16-
cargo_toml = "0.12.0"
16+
cargo_toml = "0.12.1"
1717
clap = { version = "3.2.22", features = ["derive"] }
1818
compact_str = { version = "0.6.0", features = ["serde"] }
1919
crates_io_api = { version = "0.8.1", default-features = false }

0 commit comments

Comments
 (0)