diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a74493d..b7a4bdf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: tool: cargo-hack,cargo-llvm-cov,cargo-minimal-versions,parse-changelog,cargo-udeps,cargo-valgrind,cargo-deny,cross,nextest,protoc,shellcheck,shfmt,wasm-pack,wasmtime,mdbook,mdbook-linkcheck,cargo-watch - container: alpine:latest # cargo-udeps,protoc,valgrind,wasmtime,mdbook,mdbook-linkcheck,cargo-watch don't provide prebuilt binaries for musl host. - tool: cargo-hack,cargo-llvm-cov,cargo-minimal-versions,parse-changelog,cargo-valgrind,cargo-deny,cross,nextest,shellcheck,shfmt,wasm-pack + tool: cargo-hack,cargo-llvm-cov,cargo-minimal-versions,parse-changelog,cargo-valgrind,cargo-deny,cross,nextest,shellcheck,shfmt,wasm-pack,cargo-binstall runs-on: ubuntu-latest container: ${{ matrix.container }} steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a628afb..2b67ee40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com ## [Unreleased] - Update `shfmt@latest` to 3.6.0. +- Support installing `cargo-binstall` on linux with custom host targets such as x86_64-alpine-linux-musl. ## [1.15.3] - 2022-12-11 diff --git a/main.sh b/main.sh index 895a686b..d3a9d43b 100755 --- a/main.sh +++ b/main.sh @@ -98,14 +98,14 @@ install_cargo_binstall() { host_triple 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" ;; - x86_64-unknown-linux-musl) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;; + x86_64-*-linux-gnu) url="${base_url}-x86_64-unknown-linux-musl.tgz" ;; + x86_64-*-linux-musl) url="${base_url}-x86_64-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" ;; + armv7-*-linux-gnueabihf) url="${base_url}-armv7-unknown-linux-musleabihf.tgz" ;; + armv7-*-linux-musleabihf) url="${base_url}-armv7-unknown-linux-musleabihf.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" ;; + aarch64-*-linux-gnu) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;; + aarch64-*-linux-musl) url="${base_url}-aarch64-unknown-linux-musl.tgz" ;; x86_64-pc-windows-gnu) url="${base_url}-x86_64-pc-windows-msvc.zip" ;;