Compare commits

...

4 Commits

Author SHA1 Message Date
Taiki Endo
7d5481ab3a Release 1.8.1 2022-07-26 12:08:13 +09:00
Taiki Endo
b6afd8d427 Fix cargo-binstall installation failure take 2 2022-07-26 12:07:17 +09:00
Taiki Endo
d1839c2f68 Fix cargo-binstall installation failure
`head` doesn't accept `1` option.
2022-07-26 12:05:34 +09:00
Taiki Endo
85064bbc1c Move cargo-binstall version output to install_cargo_binstall 2022-07-26 12:03:09 +09:00
2 changed files with 12 additions and 3 deletions

View File

@@ -10,6 +10,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
## [Unreleased]
## [1.8.1] - 2022-07-26
- Fix cargo-binstall installation failure.
## [1.8.0] - 2022-07-26
- Only use musl binaries for nextest if glibc isn't available. See [#13](https://github.com/taiki-e/install-action/issues/13) for more.
@@ -234,7 +238,8 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
Initial release
[Unreleased]: https://github.com/taiki-e/install-action/compare/v1.8.0...HEAD
[Unreleased]: https://github.com/taiki-e/install-action/compare/v1.8.1...HEAD
[1.8.1]: https://github.com/taiki-e/install-action/compare/v1.8.0...v1.8.1
[1.8.0]: https://github.com/taiki-e/install-action/compare/v1.7.0...v1.8.0
[1.7.0]: https://github.com/taiki-e/install-action/compare/v1.6.1...v1.7.0
[1.6.1]: https://github.com/taiki-e/install-action/compare/v1.6.0...v1.6.1

View File

@@ -94,6 +94,8 @@ install_cargo_binstall() {
esac
download "${url}" "${cargo_bin}" "cargo-binstall${exe}"
info "cargo-binstall installed at $(type -P "cargo-binstall${exe}")"
x cargo binstall --help | head -1 # cargo binstall doesn't have a normal --version flag
else
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall"
fi
@@ -344,7 +346,10 @@ for tool in "${tools[@]}"; do
linux* | darwin*) chmod +x "${cargo_bin}/${tool}${exe}" ;;
esac
;;
cargo-binstall) install_cargo_binstall ;;
cargo-binstall)
install_cargo_binstall
continue
;;
*)
cargo_binstall "${tool}" "${version}"
continue
@@ -353,7 +358,6 @@ for tool in "${tools[@]}"; do
info "${tool} installed at $(type -P "${bin}")"
case "${bin}" in
cargo-binstall) x cargo binstall | head 1 ;; # cargo binstall doesn't have a normal --version flag
cargo-*) x cargo "${tool#cargo-}" --version ;;
*) x "${tool}" --version ;;
esac