Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use cargo-binstall as fallback in main.sh #8

Merged
merged 26 commits into from
Jun 10, 2022
Merged

Use cargo-binstall as fallback in main.sh #8

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
129207f
Use `cargo-binstall` as fallback in `main.sh`
NobodyXu May 31, 2022
71aaa21
Fix download: Use `curl` with https >=tls1.2 with retry
NobodyXu May 31, 2022
59b2718
Fix typo in `cargo_binstall` of `main.sh`
NobodyXu May 31, 2022
c0d0c84
Install `cargo-binstall` and cache it in `cargo_bin` of `main.sh`
NobodyXu May 31, 2022
5067f75
Fix `cargo_binstall`: Add quoting for all variables
NobodyXu May 31, 2022
0a98705
Fix `cargo_binstall`: rm `rm cargo-binstall`
NobodyXu May 31, 2022
2519b8c
Fix shfmt error
NobodyXu Jun 1, 2022
11ecb58
Refactor code: Improve readbility of fn `cargo_binstall`
NobodyXu Jun 2, 2022
1f938cf
Add `info` logging to `cargo_binstall`
NobodyXu Jun 2, 2022
bd6a7ff
Support target `x86_64-pc-windows-gnu` in fn `cargo_binstall`
NobodyXu Jun 2, 2022
2bada2f
Refactor fn `cargo_binstall`: Extract `install_cargo_binstall`
NobodyXu Jun 3, 2022
f57c414
Support installing tool `cargo-binstall` in `main.sh`
NobodyXu Jun 3, 2022
cfd7dc3
Improve logging in `install_cargo_binstall`
NobodyXu Jun 3, 2022
6cbd0ee
Rm workaround for target detection for `cargo-binstall`
NobodyXu Jun 8, 2022
9d8d9f8
Add unit test for `cargo_binstall` in `main.sh`
NobodyXu Jun 8, 2022
6f2c60c
Merge branch 'main' into feature/cargo-binstall
NobodyXu Jun 8, 2022
27fb16f
Fix `install_cargo_binstall` in `main.sh`
NobodyXu Jun 8, 2022
0c7867a
Test `cargo-binstall` on mac and win
NobodyXu Jun 8, 2022
4e18337
Update main.sh
NobodyXu Jun 8, 2022
3a9f585
Update main.sh
NobodyXu Jun 8, 2022
5390063
Test `cargo_binstall` in `main.sh` using `cargo-watch`
NobodyXu Jun 8, 2022
0042249
Add debugging in `install_cargo_binstall`
NobodyXu Jun 8, 2022
08ed50f
Try to fix final step of `install_cargo_binstall`
NobodyXu Jun 8, 2022
836c0c8
Fix `cargo_bin`: Use `$HOME` instead of `~`
NobodyXu Jun 8, 2022
dbc2ebe
Rm debugging code in `install_cargo_binstall`
NobodyXu Jun 8, 2022
602ac3a
Remove rebundant logging in `main.sh`
NobodyXu Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor code: Improve readbility of fn cargo_binstall 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
  • Loading branch information
@NobodyXu
NobodyXu committed Jun 2, 2022
commit 11ecb5882d81dd9d982722a722456024d4844835
34 changes: 17 additions & 17 deletions main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,29 @@ cargo_binstall() {
version="$2"

NobodyXu marked this conversation as resolved.
Show resolved Hide resolved
target="$(rustc -vV | grep host | cut -c 7-)"
base_url=https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall
is_zip=false
case "${target}" in
x86_64-unknown-linux-gnu) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;
x86_64-unknown-linux-musl) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;
cargo_bin="${CARGO_HOME:-~/.cargo}/bin"

armv7-unknown-linux-gnueabihf) url="${base_url}-armv7-unknown-linux-musleabihf.tgz" ;;
armv7-unknown-linux-musleabihf) url="${base_url}-armv7-unknown-linux-musleabihf.tgz" ;;
if [ ! -f "${cargo_bin}/cargo-binstall" ]; then
base_url=https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall
is_zip=false
case "${target}" in
x86_64-unknown-linux-gnu) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;
x86_64-unknown-linux-musl) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;;

aarch64-unknown-linux-gnu) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;;
aarch64-unknown-linux-musl) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;;
armv7-unknown-linux-gnueabihf) url="${base_url}-armv7-unknown-linux-musleabihf.tgz" ;;
armv7-unknown-linux-musleabihf) url="${base_url}-armv7-unknown-linux-musleabihf.tgz" ;;

x86_64-apple-darwin | aarch64-apple-darwin | x86_64-pc-windows-msvc)
is_zip=true
url="${base_url}-${target}.zip"
;;
aarch64-unknown-linux-gnu) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;;
aarch64-unknown-linux-musl) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;;

*) bail "unsupported target '${target}' for cargo-binstall" ;;
esac
x86_64-apple-darwin | aarch64-apple-darwin | x86_64-pc-windows-msvc)
is_zip=true
url="${base_url}-${target}.zip"
;;

cargo_bin="${CARGO_HOME:-~/.cargo}/bin"
*) bail "unsupported target '${target}' for cargo-binstall" ;;
esac

if [ ! -f "${cargo_bin}/cargo-binstall" ]; then
if [ $is_zip = true ]; then
retry curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "$url" -o "cargo-binstall-${target}.zip"
unzip "cargo-binstall-${target}.zip"
Expand Down