diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da49ea75..52189d93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: # Note: Specifying the version of valgrind and wasm-pack is not supported. # cargo-watch is supported by cargo-binstall (through quickinstall) - cargo-hack,cargo-llvm-cov,cargo-minimal-versions,parse-changelog,cross,nextest,shellcheck,shfmt,valgrind,wasm-pack,wasmtime,mdbook,cargo-watch - - cargo-hack@0.5.14,cargo-llvm-cov@0.4.8,cargo-minimal-versions@0.1.4,parse-changelog@0.4.8,cross@0.2.1,nextest@0.9.11,shellcheck@0.8.0,shfmt@3.5.1,wasmtime@0.38.1,mdbook@0.4.19,cargo-watch@8.1.1 + - cargo-hack@0.5.14,cargo-llvm-cov@0.4.8,cargo-minimal-versions@0.1.4,parse-changelog@0.4.8,cross@0.2.2,nextest@0.9.11,shellcheck@0.8.0,shfmt@3.5.1,wasmtime@0.38.1,mdbook@0.4.19,cargo-watch@8.1.1 # Nextest supports basic version ranges as well - nextest@0.9 include: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e8d57af..32c79315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com ## [Unreleased] +- Update `cross@latest` to 0.2.2. + ## [1.5.1] - 2022-07-02 - Update `mdbook@latest` to 0.4.19. diff --git a/main.sh b/main.sh index 07f1ba2d..b3a08dd1 100755 --- a/main.sh +++ b/main.sh @@ -153,7 +153,7 @@ for tool in "${tools[@]}"; do ;; cross) # https://github.com/cross-rs/cross/releases - latest_version="0.2.1" + latest_version="0.2.2" repo="cross-rs/cross" case "${OSTYPE}" in linux*) target="x86_64-unknown-linux-musl" ;; @@ -164,7 +164,10 @@ for tool in "${tools[@]}"; do case "${version}" in latest) version="${latest_version}" ;; esac - url="https://github.com/${repo}/releases/download/v${version}/cross-v${version}-${target}.tar.gz" + case "${version}" in + 0.1* | 0.2.[0-1]) url="https://github.com/${repo}/releases/download/v${version}/cross-v${version}-${target}.tar.gz" ;; + *) url="https://github.com/${repo}/releases/download/v${version}/cross-${target}.tar.gz" ;; + esac # shellcheck disable=SC2086 retry curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "${url}" \ | tar xzf - -C ${CARGO_HOME:-~/.cargo}/bin