Compare commits

...

5 Commits

Author SHA1 Message Date
Taiki Endo
e380e63944 Release 1.13.7 2022-09-25 17:14:11 +09:00
Taiki Endo
0f4d53b2aa Update changelog 2022-09-25 17:13:49 +09:00
Taiki Endo
ac22f2e031 Do not use cargo-binstall for upgrade for cargo-binstall (#23) 2022-09-25 17:08:12 +09:00
Taiki Endo
c079fd141a Insert new line after cargo-binstall version output 2022-09-25 16:32:11 +09:00
Jiahao XU
edbd1909dc Ensure that cargo-binstall 0.13.3 is used (#22)
* Ensure that 0.13.3 is used
* Remove passing deprecated `--secure` flag to `cargo-binstall`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
2022-09-25 16:12:29 +09:00
2 changed files with 25 additions and 10 deletions

View File

@@ -10,6 +10,11 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
## [Unreleased]
## [1.13.7] - 2022-09-25
- Work around cargo-binstall upgrade issue on Windows. ([#23](https://github.com/taiki-e/install-action/pull/23))
- Ensure that the latest cargo-binstall is used. ([#22](https://github.com/taiki-e/install-action/pull/22), thanks @NobodyXu)
## [1.13.6] - 2022-09-25
- Update `cargo-binstall@latest` to 0.13.3.
@@ -345,7 +350,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.13.6...HEAD
[Unreleased]: https://github.com/taiki-e/install-action/compare/v1.13.7...HEAD
[1.13.7]: https://github.com/taiki-e/install-action/compare/v1.13.6...v1.13.7
[1.13.6]: https://github.com/taiki-e/install-action/compare/v1.13.5...v1.13.6
[1.13.5]: https://github.com/taiki-e/install-action/compare/v1.13.4...v1.13.5
[1.13.4]: https://github.com/taiki-e/install-action/compare/v1.13.3...v1.13.4

27
main.sh
View File

@@ -79,12 +79,23 @@ host_triple() {
fi
}
install_cargo_binstall() {
if [[ ! -f "${cargo_bin}/cargo-binstall" ]]; then
# https://github.com/cargo-bins/cargo-binstall/releases
binstall_version="0.13.3"
install_binstall='1'
if [[ -f "${cargo_bin}/cargo-binstall${exe}" ]]; then
if [[ "$(cargo binstall -V)" == "cargo-binstall ${binstall_version}" ]]; then
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}"
install_binstall=''
else
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}, but is not compatible version with install-action, upgrading"
rm "${cargo_bin}/cargo-binstall${exe}"
fi
fi
if [[ -n "${install_binstall}" ]]; then
info "installing cargo-binstall"
host_triple
# https://github.com/cargo-bins/cargo-binstall/releases
binstall_version="0.13.3"
base_url="https://github.com/cargo-bins/cargo-binstall/releases/download/v${binstall_version}/cargo-binstall"
case "${host}" in
x86_64-unknown-linux-gnu) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;
@@ -108,9 +119,6 @@ install_cargo_binstall() {
download "${url}" "${cargo_bin}" "cargo-binstall${exe}"
info "cargo-binstall installed at $(type -P "cargo-binstall${exe}")"
x cargo binstall -V
else
info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall, upgrading"
cargo binstall --secure --no-confirm --version '>=0.12.0' cargo-binstall
fi
}
cargo_binstall() {
@@ -121,12 +129,12 @@ cargo_binstall() {
install_cargo_binstall
# --secure mode enforce downloads over secure transports only.
# By default, cargo-binstall enforce downloads over secure transports only.
# As a result, http will be disabled, and it will also set
# min tls version to be 1.2
case "${version}" in
latest) cargo binstall --force --secure --no-confirm "${tool}" ;;
*) cargo binstall --force --secure --no-confirm --version "${version}" "${tool}" ;;
latest) cargo binstall --force --no-confirm "${tool}" ;;
*) cargo binstall --force --no-confirm --version "${version}" "${tool}" ;;
esac
}
@@ -469,6 +477,7 @@ for tool in "${tools[@]}"; do
;;
cargo-binstall)
install_cargo_binstall
echo
continue
;;
*)