Use cargo-binstall to install nextest

taiki-e · Aug 5, 2023 · 1cdb36b · 1cdb36b
1 parent c25f50b
commit 1cdb36b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 845 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ https://spdx.org/licenses
 | [**just**](https://github.com/casey/just) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/casey/just/releases) | Linux, macOS, Windows | [CC0-1.0](https://github.com/casey/just/blob/HEAD/LICENSE) |
 | [**mdbook-linkcheck**](https://github.com/Michael-F-Bryan/mdbook-linkcheck) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases) | Linux, macOS, Windows | [MIT](https://github.com/Michael-F-Bryan/mdbook-linkcheck/blob/HEAD/LICENSE) |
 | [**mdbook**](https://github.com/rust-lang/mdBook) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/rust-lang/mdBook/releases) | Linux, macOS, Windows | [MPL-2.0](https://github.com/rust-lang/mdBook/blob/HEAD/LICENSE) |
-| [**nextest**](https://github.com/nextest-rs/nextest) (alias: `cargo-nextest`) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/nextest-rs/nextest/releases) | Linux, macOS, Windows | [Apache-2.0](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-APACHE) OR [MIT](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-MIT) |
+| [**nextest**](https://github.com/nextest-rs/nextest) (alias: `cargo-nextest`) | `$CARGO_HOME/bin` | cargo-binstall | Linux, macOS, Windows | [Apache-2.0](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-APACHE) OR [MIT](https://github.com/nextest-rs/nextest/blob/HEAD/LICENSE-MIT) |
 | [**parse-changelog**](https://github.com/taiki-e/parse-changelog) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/taiki-e/parse-changelog/releases) | Linux, macOS, Windows | [Apache-2.0](https://github.com/taiki-e/parse-changelog/blob/HEAD/LICENSE-APACHE) OR [MIT](https://github.com/taiki-e/parse-changelog/blob/HEAD/LICENSE-MIT) |
 | [**protoc**](https://github.com/protocolbuffers/protobuf) | `$HOME/.install-action/bin` | [GitHub Releases](https://github.com/protocolbuffers/protobuf/releases) | Linux, macOS, Windows | [BSD-3-Clause](https://github.com/protocolbuffers/protobuf/blob/HEAD/LICENSE) |
 | [**shellcheck**](https://www.shellcheck.net) | `/usr/local/bin` | [GitHub Releases](https://github.com/koalaman/shellcheck/releases) | Linux, macOS, Windows | [GPL-3.0-or-later](https://github.com/koalaman/shellcheck/blob/HEAD/LICENSE) |

diff --git a/main.sh b/main.sh
@@ -178,21 +178,6 @@ read_manifest() {
                 # TODO: However, a warning may make sense.
                 host_platform="${host_arch}_linux_gnu"
                 download_info=$(jq <<<"${manifest}" -r ".${host_platform}")
-            elif [[ "${host_env}" == "gnu" ]]; then
-                # TODO: don't hardcode tool name and use 'prefer_linux_gnu' field in base manifest.
-                case "${tool}" in
-                    cargo-nextest | nextest)
-                        # TODO: don't hardcode required glibc version
-                        required_glibc_version=2.27
-                        higher_glibc_version=$(sort <<<"${required_glibc_version}"$'\n'"${host_glibc_version}" -Vu | tail -1)
-                        if [[ "${higher_glibc_version}" == "${host_glibc_version}" ]]; then
-                            # musl build of nextest is slow, so use glibc build if host_env is gnu.
-                            # https://github.com/taiki-e/install-action/issues/13
-                            host_platform="${host_arch}_linux_gnu"
-                            download_info=$(jq <<<"${manifest}" -r ".${host_platform}")
-                        fi
-                        ;;
-                esac
             fi
             ;;
         macos | windows)
@@ -364,13 +349,6 @@ exe=""
 case "$(uname -s)" in
     Linux)
         host_os=linux
-        ldd_version=$(ldd --version 2>&1 || true)
-        if grep <<<"${ldd_version}" -q 'musl'; then
-            host_env="musl"
-        else
-            host_env="gnu"
-            host_glibc_version=$(grep <<<"${ldd_version}" -E "GLIBC|GNU libc" | sed "s/.* //g")
-        fi
         if grep -q '^ID_LIKE=' /etc/os-release; then
             base_distro="$(grep '^ID_LIKE=' /etc/os-release | sed 's/^ID_LIKE=//')"
             case "${base_distro}" in