mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-04-25 06:40:03 +00:00
Fix v1 manifest format for git and local path (#1821)
* Bump simple-git to v0.2.10 Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> * Fix v1 manifest format for git and local path Fixed #1815 Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> * Fix v1 format for custom registry Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> * Remove unused functions Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> * Fix compilation Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> * Update git.sh Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Fixed git.sh for windows Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * fixx git.sh for win Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Update git.sh Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * fix git.sh Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
parent
5a316b765f
commit
eba07fb147
12 changed files with 112 additions and 38 deletions
|
@ -46,16 +46,29 @@ cp -r manifests/workspace/* "$GIT"
|
|||
git add .
|
||||
git commit -m 'Update to workspace'
|
||||
)
|
||||
COMMIT_HASH="$(cd "$GIT" && git rev-parse HEAD)"
|
||||
|
||||
# Install binaries using `--git`
|
||||
if [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ]; then
|
||||
source="(git+file:///$(cygpath -m "$GIT")#$COMMIT_HASH)"
|
||||
else
|
||||
source="(git+file://$GIT#$COMMIT_HASH)"
|
||||
fi
|
||||
|
||||
# Install cargo-binstall using `--git`
|
||||
"./$1" binstall --force --git "file://$GIT" --no-confirm cargo-binstall
|
||||
|
||||
test_cargo_binstall_install
|
||||
|
||||
# Install binaries using `--git`
|
||||
cat "$CARGO_HOME/.crates.toml"
|
||||
grep -F "cargo-binstall 0.12.0 $source" <"$CARGO_HOME/.crates.toml"
|
||||
|
||||
# Install cargo-watch using `--git`
|
||||
"./$1" binstall --force --git "file://$GIT" --no-confirm cargo-watch
|
||||
|
||||
cargo_watch_version="$(cargo watch -V)"
|
||||
echo "$cargo_watch_version"
|
||||
|
||||
[ "$cargo_watch_version" = "cargo-watch 8.4.0" ]
|
||||
|
||||
cat "$CARGO_HOME/.crates.toml"
|
||||
grep -F "cargo-watch 8.4.0 $source" <"$CARGO_HOME/.crates.toml"
|
||||
|
|
|
@ -19,3 +19,6 @@ cargo_binstall_version="$(cargo binstall -V)"
|
|||
echo "$cargo_binstall_version"
|
||||
|
||||
[ "$cargo_binstall_version" = "cargo-binstall 0.12.0" ]
|
||||
|
||||
cat "$CARGO_HOME/.crates.toml"
|
||||
grep -F "cargo-binstall 0.12.0 (path+file://manifests/github-test-Cargo.toml)" <"$CARGO_HOME/.crates.toml"
|
||||
|
|
|
@ -43,20 +43,27 @@ EOF
|
|||
# Install binaries using default registry in config
|
||||
"./$1" binstall --force -y cargo-binstall@0.12.0
|
||||
|
||||
grep -F "cargo-binstall 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" <"$CARGO_HOME/.crates.toml"
|
||||
|
||||
test_cargo_binstall_install
|
||||
|
||||
# Install binaries using registry t2 in config
|
||||
"./$1" binstall --force --registry t2 -y cargo-binstall@0.12.0
|
||||
|
||||
grep -F "cargo-binstall 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" <"$CARGO_HOME/.crates.toml"
|
||||
|
||||
test_cargo_binstall_install
|
||||
|
||||
# Install binaries using registry t3 in env
|
||||
CARGO_REGISTRIES_t3_INDEX='sparse+https://index.crates.io/' "./$1" binstall --force --registry t3 -y cargo-binstall@0.12.0
|
||||
|
||||
test_cargo_binstall_install
|
||||
grep -F "cargo-binstall 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" <"$CARGO_HOME/.crates.toml"
|
||||
|
||||
test_cargo_binstall_install
|
||||
|
||||
# Install binaries using index directly
|
||||
"./$1" binstall --force --index 'sparse+https://index.crates.io/' -y cargo-binstall@0.12.0
|
||||
|
||||
grep -F "cargo-binstall 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" <"$CARGO_HOME/.crates.toml"
|
||||
|
||||
test_cargo_binstall_install
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue