diff --git a/README.md b/README.md index 5a4350e6..6fbbafb0 100644 --- 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 index e59d5d0b..c32ada62 100755 --- 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 diff --git a/manifests/cargo-nextest.json b/manifests/cargo-nextest.json deleted file mode 100644 index 2977e1f8..00000000 --- a/manifests/cargo-nextest.json +++ /dev/null @@ -1,770 +0,0 @@ -{ - "rust_crate": "cargo-nextest", - "template": { - "x86_64_linux_gnu": { - "url": "https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${version}/cargo-nextest-${version}-x86_64-unknown-linux-gnu.tar.gz" - }, - "x86_64_linux_musl": { - "url": "https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${version}/cargo-nextest-${version}-x86_64-unknown-linux-musl.tar.gz" - }, - "x86_64_macos": { - "url": "https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${version}/cargo-nextest-${version}-universal-apple-darwin.tar.gz" - }, - "x86_64_windows": { - "url": "https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${version}/cargo-nextest-${version}-x86_64-pc-windows-msvc.tar.gz" - }, - "aarch64_linux_gnu": { - "url": "https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${version}/cargo-nextest-${version}-aarch64-unknown-linux-gnu.tar.gz" - } - }, - "latest": { - "version": "0.9.57" - }, - "0.9": { - "version": "0.9.57" - }, - "0.9.57": { - "x86_64_linux_gnu": { - "checksum": "5fc2416dd001ec89d904a345465da0b91452896b74621a82fec33e33d4856320" - }, - "x86_64_linux_musl": { - "checksum": "c9275cb47f75936ad9a6ff24557f210c7a248d284f9b9d6953e128e907b1a926" - }, - "x86_64_macos": { - "checksum": "8a66df687d857f173ca6ac7773c699883beca09ce558852bc620d023336ee3b4" - }, - "x86_64_windows": { - "checksum": "75e2b29d49b1b86d15f61051620aeffb159322f9c262cec2646a96ec79bfac85" - }, - "aarch64_linux_gnu": { - "checksum": "e567e43446969205fd26da6f09c03f965fce20df3a0c476c4f2f77ed30ff2538" - } - }, - "0.9.56": { - "x86_64_linux_gnu": { - "checksum": "914f380306a7216c8b79ca4408cc39073eaaea9e7b2101e2bfe0c123636a478b" - }, - "x86_64_linux_musl": { - "checksum": "ec12fa3f52655033aa35581f300bac63cd16b372ca68c85a5621c25255cae759" - }, - "x86_64_macos": { - "checksum": "aa748f80fe110e6ea607d5dd264e1fe3513b631a7957605cdd8bb12e5cc878f9" - }, - "x86_64_windows": { - "checksum": "185cddb1d347c3b0e9e1cebd919297809491394aaa1b2abe5109a6139be5e400" - }, - "aarch64_linux_gnu": { - "checksum": "07bbc36fec9dfbe95b0a2e6fc0446175dfb9d58e24474095768965591625a19c" - } - }, - "0.9.55": { - "x86_64_linux_gnu": { - "checksum": "b5bab814d720561c002b5cbe899f997c20407689cfba23754b5a6c20ae3cac4a" - }, - "x86_64_linux_musl": { - "checksum": "2ae6cd6198a60c73e906ed99fcc7254ae6dae68076ea2c24f5acda83c5918ffd" - }, - "x86_64_macos": { - "checksum": "adbcbd9c2c1634e90c0cc8f376633ff76242a722a81938ecda6fe9131cc90aa6" - }, - "x86_64_windows": { - "checksum": "64280ff486b3af59a7c4e095f293f292211b334b9b17c7d4bd45445aabfe15e5" - }, - "aarch64_linux_gnu": { - "checksum": "0dbd309e53c001a18afb5f3a3839d0427421bc06ba057b28506d08e7ae2fb20a" - } - }, - "0.9.54": { - "x86_64_linux_gnu": { - "checksum": "ed393824489793854193906946d972afc1e3c32a18aed5bc9dafc2cb3547bead" - }, - "x86_64_linux_musl": { - "checksum": "898bdec39d25f8c60eb984fe440a7a2e677a7f8b881ad7f0bdc44d1236700ab7" - }, - "x86_64_macos": { - "checksum": "436c10a0c32aaefe3680a8550903f1382436a7954ecea5156f99c7f207516466" - }, - "x86_64_windows": { - "checksum": "45bb1ac2cbe1286ded194619befe860adde01b14c0f4c7a77352022fb2be254d" - }, - "aarch64_linux_gnu": { - "checksum": "c62ae5598a857655ba7c6299be5254244c78dfb249d83f6634804221e3f0faa0" - } - }, - "0.9.53": { - "x86_64_linux_gnu": { - "checksum": "b07def6a5e5521481eb5853e5f17650be406ce8c57ce917a90d2866c788e5967" - }, - "x86_64_linux_musl": { - "checksum": "432af91cae859413b79bd50baea327badffe7d488ce4ffd5d301bd84b007b889" - }, - "x86_64_macos": { - "checksum": "ccab0a046538cb86a93ee6f05a1d9ceace7878fc7ca39392b681b01dc27fc54e" - }, - "x86_64_windows": { - "checksum": "49605a5f5f3275d1e8a2fdfaa0a45a52df03cfd791ad5b1a093b196df3a408d5" - }, - "aarch64_linux_gnu": { - "checksum": "54e47dc3fcf7eead6307ac06a9e02ce9a0fe3a156a53b062b63f823cd2765bfd" - } - }, - "0.9.52": { - "x86_64_linux_gnu": { - "checksum": "55bf039be0d14e4266eaacd765a292294c8627787dcb31d503690a9c14ad21fc" - }, - "x86_64_linux_musl": { - "checksum": "7e6b14b379b8315f81d1e2542e6f6de9fffda6ca9c95054ebc0560f52a27038f" - }, - "x86_64_macos": { - "checksum": "d4638b6ec6e8e8d8f3cf4ff8f039665f0a1d4ff2cf7ef6467bdb243e654c9911" - }, - "x86_64_windows": { - "checksum": "af5c3227e870b9f1719d8993d09dc3f2871c4e34b06d8711679129c370a0fa0d" - }, - "aarch64_linux_gnu": { - "checksum": "ee7d4f5264c5be5177b3a0bb8fb0bd2100592a6ea29bcbef1d98b782c09e5dc0" - } - }, - "0.9.51": { - "x86_64_linux_gnu": { - "checksum": "5cbf80e72737d63a601f139d6ff1c42ca9cf6204cd7991f7d6ce7458f2c12bbc" - }, - "x86_64_linux_musl": { - "checksum": "2d7def02b6b795b7b44fe2cca9b1b9e77bcb4c8903957ad502f60f45a2f92e9a" - }, - "x86_64_macos": { - "checksum": "607c0cac7d659bb957af12a136756821771b9d91f03ccae24b255363e7fcbfda" - }, - "x86_64_windows": { - "checksum": "4a97e5ab319af4347549e8414df2af5af7d9f8b4cee8650bad0111d2007711b2" - }, - "aarch64_linux_gnu": { - "checksum": "8da18d12f95280bf1a7bde6e13cb8e1e2ea877acc4e826c27ab6c5df653fafca" - } - }, - "0.9.50": { - "x86_64_linux_gnu": { - "checksum": "4586cfb628f70f6493d9f861b0c71dbe66622128e935ca3c922010bd460673ba" - }, - "x86_64_linux_musl": { - "checksum": "c8b766b6bc28018b8a2c0597b97dd8183fe5a81ddd51fbcc1e9892147887eca3" - }, - "x86_64_macos": { - "checksum": "77405db34f1191cc6979b3e291e7aaf587a40ee231cbccbe1885fd89e31ee577" - }, - "x86_64_windows": { - "checksum": "6e8a2f4deeb4ade48f4424a65db13bd5122dec73d59a4eeac51c13eb997e1bdf" - }, - "aarch64_linux_gnu": { - "checksum": "ebb3198673a199518548af5f8c1a5be7e15a85e9ca5c3978caeb7e0cd09f2969" - } - }, - "0.9.49": { - "x86_64_linux_gnu": { - "checksum": "5e19c5038c9940da4c47a9ae87f94b352dc98c2ab75b4b9aeae227cdff8440d2" - }, - "x86_64_linux_musl": { - "checksum": "b09d7870bba824af1acfce505811951f0d81cf21b144490c6a3f34f59bcc182b" - }, - "x86_64_macos": { - "checksum": "171bc696474667208587c74d9acce0250f3b2eac1faad39458e828a65c3f1c93" - }, - "x86_64_windows": { - "checksum": "e9c532bb99c6e8e7edb65578f8c251fb3d87a3377bef1128763442dc7f088ebb" - }, - "aarch64_linux_gnu": { - "checksum": "40ff81ed279e8a6d38ebe06ee75bba47785e8cb006267e35a15c157724e8e437" - } - }, - "0.9.48": { - "x86_64_linux_gnu": { - "checksum": "9730218bacb5f6c1697a4f44a94958a3ce708e8cc7ff430ac007075620b49b09" - }, - "x86_64_linux_musl": { - "checksum": "bc6c52c443469342d9eeed564d78007c8c7aca6c592153d1743b6c2530b195b8" - }, - "x86_64_macos": { - "checksum": "ee592baa34e0210bc2195a9369e13cc520e926ee6cbfec8727c653c1f8a275c4" - }, - "x86_64_windows": { - "checksum": "3d34a3be1ace82dc33f52a8396743ad19f1f78739d44fc755a927fb1c187c071" - }, - "aarch64_linux_gnu": { - "checksum": "13af6c207cfae0219f6ec3760980d951292815d26f575f4c099ae1797af7505a" - } - }, - "0.9.47": { - "x86_64_linux_gnu": { - "checksum": "8518f212d10ab67ad620bcf8dff755a0f083757440881143c31a3904821f260f" - }, - "x86_64_linux_musl": { - "checksum": "879605757d4b7bbb8aa2c108e91a328ea1d5af38a1be236bccc5aec7eed60446" - }, - "x86_64_macos": { - "checksum": "23ad7efe005bbbc686eabdc4be6f471fabc64ef6caf161d92ec8f0ef9dcb38f5" - }, - "x86_64_windows": { - "checksum": "22d838040a0106c0fbe06a0f13bc0995c92e81898f2355421c07fe2f856dd2ed" - }, - "aarch64_linux_gnu": { - "checksum": "98260769d5762f35f2e2d7b1812372f4639d2ab4078e1967d1daf659331b879b" - } - }, - "0.9.46": { - "x86_64_macos": { - "checksum": "938fa847ab1d7d0fa94dbeb9bdea817187bcf89c59d2a871b24042b09ad17944" - } - }, - "0.9.45": { - "x86_64_linux_gnu": { - "checksum": "fb7dd79b1b16e2c8a4476c72091988852966ad42dd969eaf3469b84bb996f08c" - }, - "x86_64_linux_musl": { - "checksum": "6ca9583d08da02bc8b4e6c4d94d341cce4784057fb27730e64e01b70fe004afd" - }, - "x86_64_macos": { - "checksum": "dc50fb656120753932f88b5c9de0ed64d3bd738d1615d1d5b9849c393328cdd1" - }, - "x86_64_windows": { - "checksum": "8222d7f4ba8d4d62bb21ecf2dac3695025e77d00ea711bd8043a0c4605250b4d" - }, - "aarch64_linux_gnu": { - "checksum": "e8aef754b393369cff845ffe1a0acba569b04f4747874320e71bb15593c8235d" - } - }, - "0.9.44": { - "x86_64_linux_gnu": { - "checksum": "544e15a10bdea2e98da6762d062a61fe1e1a24235200895c9f1c4817d3d9fec1" - }, - "x86_64_linux_musl": { - "checksum": "5174ecb5f0fa699dcf2c90f2689b5d6e32e0d5b9ab24fd309c00d865710fa8b8" - }, - "x86_64_macos": { - "checksum": "ae20bb213ca44898b49b30fad9eb90b00f4997032bd0815f11571109c3e675b2" - }, - "x86_64_windows": { - "checksum": "1c6d5e02ac53495d1efd7754337a64d362bc917b7a063de8cb560352696d0167" - }, - "aarch64_linux_gnu": { - "checksum": "7293c00fcc3a1f77e2b12438aba0de8612b4b5ed6b6eaa5b1665db9d84e99ba0" - } - }, - "0.9.43": { - "x86_64_linux_gnu": { - "checksum": "448e6700d5b0e459b9dcd73f6ebc76fd57bd1c621f4ac5f2c915ac90d6e89c84" - }, - "x86_64_linux_musl": { - "checksum": "b40f83e6093ba0822daf43caa5fb3f64fc098cfbb1b2b8b704a1b82d280b93dd" - }, - "x86_64_macos": { - "checksum": "8fef2947e22891a8f668aab33fa05ebbf0138df6703fcc2ca963a257e6441d29" - }, - "x86_64_windows": { - "checksum": "4fc0f4c3e255dea1a07d43592056d71d19660abcfd11711e1bb3732311ca0dc4" - }, - "aarch64_linux_gnu": { - "checksum": "79da74c38d6ba1381058fb5d1318c6b318b47869349b8a80806e09596abc8017" - } - }, - "0.9.42": { - "x86_64_linux_gnu": { - "checksum": "baaed41d21ff120fed927e022c9bf74e8d31dc50a4342e7849894fc341f31c53" - }, - "x86_64_linux_musl": { - "checksum": "1b4c4442d5ca6329d5c04697fad70355569d738f37c713411c6fcd0195aac457" - }, - "x86_64_macos": { - "checksum": "12d9e8ebf0ab5cf2596dea35bee183310348d5c9625f2bda64cfbf4c342e3730" - }, - "x86_64_windows": { - "checksum": "bf69c7055f5c45f38a4c63538c8b367122557d1dd49414e62f8c38a76f31f88e" - }, - "aarch64_linux_gnu": { - "checksum": "f2de3914236041d7aa843c3d1d2304cf25e032dad2a3cd2e3fd4cbde12202b64" - } - }, - "0.9.41": { - "x86_64_macos": { - "checksum": "1d2983bed390e6e5fb13222dc0724bb54a3f67226e87e7a304c7dd3f0003ca61" - } - }, - "0.9.40": { - "x86_64_linux_gnu": { - "checksum": "d9ab201015d93bc1e47b0c9da0a778d746fb7f22c610cdc9f2dabd441dd7fc76" - }, - "x86_64_linux_musl": { - "checksum": "04772ba51706ddaffeb05688bc2a77719321aadfa31b70249c894ad85ce0fe36" - }, - "x86_64_macos": { - "checksum": "55c9c77885f8fed495bd1da06d00d676b506ea35a5c1825ff3eda0b83746b0e4" - }, - "x86_64_windows": { - "checksum": "49d80615ee2cbd213abe8bd110f5bd1990050dcefd17a34014e4d3b924339fe9" - }, - "aarch64_linux_gnu": { - "checksum": "e20dde1b62b5be9c76782b3c6521682621b04e483f4029f69c05b5f44a133704" - } - }, - "0.9.39": { - "x86_64_linux_gnu": { - "checksum": "759d6766f4686af03c99d9d641286b313b8acad01f5795d825eb33014ae0867a" - }, - "x86_64_linux_musl": { - "checksum": "1c0a1ff68ddf1e2a9acd201c12a4dab451fc3a8d1908d33e7bda406de757a689" - }, - "x86_64_macos": { - "checksum": "563d491a51d3ec4a133b83b979cd4d4ed654e5fd65bbe9ca2fd9f3021a8dab1e" - }, - "x86_64_windows": { - "checksum": "d9cb5b2a7a52b43f53f2c4afbcb3ae56d029b98342101b78d84fdfa569988eb3" - }, - "aarch64_linux_gnu": { - "checksum": "bc4300207ca8365348f6a4c5d2122873bf6ca12652b4c58c455a339e79118568" - } - }, - "0.9.38": { - "x86_64_linux_gnu": { - "checksum": "ce6a30df41bc32158d0136b59757f41e9da9b9633ca00a5f96f03c4586ea7bf5" - }, - "x86_64_linux_musl": { - "checksum": "6fadc213ccf08a3cc3149d784d13452cfb74cea5e68885e31d5853d4b56c6dc3" - }, - "x86_64_macos": { - "checksum": "1c5923ed413d82933e45dfa6ad16c08901216f39c67d2836e45048d768f91bd2" - }, - "x86_64_windows": { - "checksum": "fbf73b5e8bca59784b11fd526068ff01b5e456d66b19be6706ce93e4181e83b6" - }, - "aarch64_linux_gnu": { - "checksum": "b7fc94e638e82075286190ba696222a6768f4144ea7384ea5a25292ca5534fac" - } - }, - "0.9.37": { - "x86_64_linux_gnu": { - "checksum": "da51679397ed055a0cc2f2e63ff934d179372bbd88f937f71f7255fd5c528755" - }, - "x86_64_linux_musl": { - "checksum": "6ea9ce5726ea30ac6186dcf063dc5a4595c6779b8530200618d291ac95944e53" - }, - "x86_64_macos": { - "checksum": "01386d1242a6656eb1239cd5ce59b383f60167f687e3eb9bfd180fab86f58e47" - }, - "x86_64_windows": { - "checksum": "9f3be2d8a85b2dedaad7bccefa45dc430f9a76bf99104a44bef3fbb8553e3e5c" - }, - "aarch64_linux_gnu": { - "checksum": "41ccf7273be37af8ea466b2dfa35fe922cdd1d1b45716407f2951fb38d97a748" - } - }, - "0.9.36": { - "x86_64_linux_gnu": { - "checksum": "d2b0f7b0773e60a93aba72a9ae5c11fc348e58f38fe25d6e1877725d9e6ae475" - }, - "x86_64_linux_musl": { - "checksum": "e1b90e4bcb12ab3839eca75ef6de6a3ed46936d68037958f7a7167e4653896da" - }, - "x86_64_macos": { - "checksum": "4332636324d9ee0e786cfdefae3ee383a2a0b3ddde6fdccab212e0c09671f7fc" - }, - "x86_64_windows": { - "checksum": "7f0c7211671e1fdea76136c06110df6acca23e4e32f53c3ef6e8a537efae73c2" - }, - "aarch64_linux_gnu": { - "checksum": "b266b330fcfc7223825b46a07cdd072df3e41911515697000508baf019e64dea" - } - }, - "0.9.35": { - "x86_64_linux_gnu": { - "checksum": "fa6fbc8d848e595d847eaeddea432dad6944a4cfc4ac3156ef91173772a1c4ab" - }, - "x86_64_linux_musl": { - "checksum": "9d11ad8ed2d6401b51196d4b0c78924b0f78df323458b096c1adcdc899c8fb66" - }, - "x86_64_macos": { - "checksum": "0cbc3a22be5511ff0365499f6d0e38b0aaa62f33c8e25792a71437dbdfd0af43" - }, - "x86_64_windows": { - "checksum": "1026b2d19604d745c61635bf9fd5105c15f36bebef1cd6de2b0fc0a455de0b27" - }, - "aarch64_linux_gnu": { - "checksum": "866db5b1b39032055eb2cfb0a62f5a5a23899ce0abfba0129f44bf826b81adcf" - } - }, - "0.9.34": { - "x86_64_linux_gnu": { - "checksum": "a96acb41a9ca14d5cd5aef9e8a12c1be8f8a3362bafe4f3a3da32c56b9c1abc5" - }, - "x86_64_linux_musl": { - "checksum": "f1ef0f528e09dc2ae9dea3fb6cf234f279772170cddc1fc8a603c4733f7675cc" - }, - "x86_64_macos": { - "checksum": "406ae94f8e8ae81e7f00080449c045bee01ee569721e603f7e6eb685903dde66" - }, - "x86_64_windows": { - "checksum": "7b096f12a97ca2f7f194c25e88a2459bf078997157af85dc77603df277f63d7c" - }, - "aarch64_linux_gnu": { - "checksum": "008927576704b0650727539daa435d1636f01516bad5f45d27c21afe992fdc01" - } - }, - "0.9.33": { - "x86_64_linux_gnu": { - "checksum": "6bfd0f9f156dcad38f40282320b38cb513f19023617b9df327026cc8e41a2795" - }, - "x86_64_linux_musl": { - "checksum": "2e5b1819ebfc8c6da370ef07e9487dd42bef7ad28949aa6235dd127ad49cd064" - }, - "x86_64_macos": { - "checksum": "bee61898fdaa523b4ebfbeeacfd3f6051a77cb307b3c5ece4f35f26802e7469c" - }, - "x86_64_windows": { - "checksum": "425e9be858d5b66410cdb8ac9b9d62fc80a196aa5a9cc7c8ee7f0a5fe7bdf6a8" - }, - "aarch64_linux_gnu": { - "checksum": "1b016e421493e11a5272bd9a24fa1515d7fad2962d41393261b5823fd1c8dbf4" - } - }, - "0.9.32": { - "x86_64_linux_gnu": { - "checksum": "3c4688160d7055494ba4343b6f84c80d229576df6acf6c4caf955b01e52a67a9" - }, - "x86_64_linux_musl": { - "checksum": "86d4e3a57e99c1806315c4df1337b0044eea9fe1d57331428f79d3c1686a2187" - }, - "x86_64_macos": { - "checksum": "a5747af15b4620dcf51b166e866a6421858becdd7ee07db1b05cf9fc3e9fa7eb" - }, - "x86_64_windows": { - "checksum": "f75dc137cc4826a276d9d9dc38ce3ea93b69e4fc2fcfa13af9dd060ae9db1f9a" - }, - "aarch64_linux_gnu": { - "checksum": "c50cedfbf8c5ec41c8777e9b18f082f0cc789ee7a47de07bfa6f4549e84d8bed" - } - }, - "0.9.31": { - "x86_64_linux_gnu": { - "checksum": "e086b4d84f08ff750afc917dbe89803e3aece8ff166ab380d2c4437cd459da72" - }, - "x86_64_linux_musl": { - "checksum": "272593752ad3ce5eca51cd071efbdc463914ee091f38007f5ae684ae5d7b2733" - }, - "x86_64_macos": { - "checksum": "dda665e39e889bafee6ccfcfc8b63ad510abac9cc0d0673fe7bc928135e56055" - }, - "x86_64_windows": { - "checksum": "c72779cee829009550668d7da2ad1a1fc9081e8d14782818b8fa17c6aa763ac6" - }, - "aarch64_linux_gnu": { - "checksum": "a5c23e61574f938d1b9e0d71425b9b01a9af5dd5000a79489b5f256fb48d174e" - } - }, - "0.9.30": { - "x86_64_linux_gnu": { - "checksum": "6607736082fa6557012cd1b388cc63d3ec4b5eb344d41404c0726bfaa37c108b" - }, - "x86_64_linux_musl": { - "checksum": "fa3117e40bbb888a81da73b7ddc1d0b545ccc5684fcabc99761589c33c90ae24" - }, - "x86_64_macos": { - "checksum": "5e0f12f783dbe64343ddc168d36ee8bde961149a92883c0b7813b7831f4c33ed" - }, - "x86_64_windows": { - "checksum": "bc3728cb1a8fb34378005dc5c2e849e1ecad5c9df7be368c968d3125b895b8db" - }, - "aarch64_linux_gnu": { - "checksum": "2bbeea2fcb0a84b4349c735bafe4575a85d2c080e1863347601bbbec17f7602f" - } - }, - "0.9.29": { - "x86_64_linux_gnu": { - "checksum": "b57d1662827d85be4ea37e9e4ca0bc53b96dc564fb8d8ab2300fda3b53423895" - }, - "x86_64_linux_musl": { - "checksum": "0af9af9f9f278becd87f203fab31b9f0ef8ea69c7c9227e30a41c6c9311526dd" - }, - "x86_64_macos": { - "checksum": "3706c380fdf87bf0547b51a29c2880efcfd1c5f8839dcfcc455fc40de1ff3a6d" - }, - "x86_64_windows": { - "checksum": "5a5c3532872a1006b61e0422d6f6cc89de2ed80273f76888c9a68b2f4e039cae" - }, - "aarch64_linux_gnu": { - "checksum": "fa32a8c8951b4f6ea19fdb97799188fc8c8b1fba06afc0240a005d72b685915a" - } - }, - "0.9.28": { - "x86_64_linux_gnu": { - "checksum": "fa0f8843469cf3c541b6dedb9321ba04573d9ba75bf8608a028537ba924f0bd8" - }, - "x86_64_macos": { - "checksum": "d99f24fe2ec8887fddd6b8a7b39cc1f0c793504d8f61f965a71b3499801e6aec" - }, - "x86_64_windows": { - "checksum": "cd519077fa9dad077644ea3f0ea28455cb320c48bc0577e33f61169d81aefc4b" - } - }, - "0.9.27": { - "x86_64_linux_gnu": { - "checksum": "da3054259e0aac51d3a4392778a594fa22cef2ae22494c2cc109ffe1b895e1f6" - }, - "x86_64_macos": { - "checksum": "215594fb9dca749cc7dabc5727d6e6aeacdc4f4f835aee330cfa1d5b26a3102c" - }, - "x86_64_windows": { - "checksum": "bb78880018da246a18d5654181d3ee7a7755fe27773502147e64938ba9400634" - } - }, - "0.9.26": { - "x86_64_linux_gnu": { - "checksum": "fda7a9d8964d87da648fb2336957a5ea4c3584671eeac4d378a258873395814a" - }, - "x86_64_macos": { - "checksum": "5d13fe035eb40aa1963c9434e23cff3dc26a9644ca09ed9271f18a1b40559006" - }, - "x86_64_windows": { - "checksum": "f0c0dba573b8f486a3b452a4173f14bd3cc52dc0801f98a74ec81c86b6d46786" - } - }, - "0.9.25": { - "x86_64_linux_gnu": { - "checksum": "5a0af54644702a17690d3e9bfe5b007f5eb04a423a31560011818f6e6b828011" - }, - "x86_64_macos": { - "checksum": "012199680a32ea1834662e558a7455a4a92bbfd3825f48809fea4ccf5ad6427f" - }, - "x86_64_windows": { - "checksum": "23c3ce0f92098016651832f44f6b27d9c9d4031db421ea5afdb43dfdeb643d93" - } - }, - "0.9.24": { - "x86_64_linux_gnu": { - "checksum": "a51b6fedb9b7a4d1616bed1e84a9c001a7b74f1c238d0f82fd06f2c2c1852a15" - }, - "x86_64_macos": { - "checksum": "3b08a166428ff53d129bdce9a55a4b84c46328e91cdf6a97fe5db2070fdf4548" - }, - "x86_64_windows": { - "checksum": "6d5ae9d933af826b7cd9fce6f803c92740a48ccd1a6a9899bd3e5878cf9d1f09" - } - }, - "0.9.23": { - "x86_64_linux_gnu": { - "checksum": "e55ea8d86b2667fa630e1b3cf61eb1d5f079619ccc63c193b64545a2b6bc5cea" - }, - "x86_64_macos": { - "checksum": "3464080829d1989b1ee0e8ab99c30cba06cfa7dc413dd0d553e9197434240e4f" - }, - "x86_64_windows": { - "checksum": "c8fa3e1f0d235f93d9cd6b76e6fc75bf9d7d82929b91e3d6cf6a15975907defc" - } - }, - "0.9.22": { - "x86_64_linux_gnu": { - "checksum": "b0d05e3fc88b0fb8320a05fc860f2f5030e8f6ee2662e62750a194e8af5546f6" - }, - "x86_64_macos": { - "checksum": "9fb9d314ffc646d4537950f0cce30b4f8ac06865d43e6b4c5eb1235f657a6351" - }, - "x86_64_windows": { - "checksum": "3f92c2cbe12f50f03032c3724711c2e5e537167413c3b671203d367eda16f79f" - } - }, - "0.9.21": { - "x86_64_linux_gnu": { - "checksum": "33b905ef2202b97e7103ff7765a42547e25b2d6b781f6f985442e2b438d1aa62" - }, - "x86_64_macos": { - "checksum": "cdf95d3a0f990e74c4c2bd1332ccfc5b500067c50ff6f0b8f5862f979ce093ce" - }, - "x86_64_windows": { - "checksum": "004845877d74734b2d7465d34d4cd512fe4e81e0c407ba03faf0517cf4cef7cd" - } - }, - "0.9.20": { - "x86_64_linux_gnu": { - "checksum": "d1de19dc8e5d46aaa5fc00394e1a7ccb04160761a4d262f58d1eb6b73b80d73b" - }, - "x86_64_macos": { - "checksum": "74122e64f063169c068f6e0126ca320e686b09dc2114eaca0e3425e94e596f60" - }, - "x86_64_windows": { - "checksum": "4cb7eb9b6bd94340929b3b517360d24353526f98b19e6706e244f220f2651185" - } - }, - "0.9.19": { - "x86_64_linux_gnu": { - "checksum": "fd351b31fdb2ce547027928918820d7f07e3a1782e419427028f4993ae7be8ef" - }, - "x86_64_macos": { - "checksum": "e455850453292f2f4808b176f8c01759df81d8b9ed388aa145c0692bbe4836a3" - }, - "x86_64_windows": { - "checksum": "18071ab9afa62e1074991e07034b2924a9af69fe1be846276999f0f1df18d5f4" - } - }, - "0.9.18": { - "x86_64_linux_gnu": { - "checksum": "acbeaf13acdf5913dae7c628eaf834e2ad166567fdfbb8fc5bb1a7e3fcf1ea0d" - }, - "x86_64_macos": { - "checksum": "66b6420a1c03522b7ff1a986095a7253dacd0caa81dfadd9af4394373261274b" - }, - "x86_64_windows": { - "checksum": "79e8e2e45d493e99e536f5155e709831084c9071a0d90d0d1bb367ae3c83e8b9" - } - }, - "0.9.17": { - "x86_64_linux_gnu": { - "checksum": "2ac1d189f8efdc3ef6f487b1230c41f4f417b26caee07fef2845828cd5282ee6" - }, - "x86_64_macos": { - "checksum": "72bb8422383d3ae97988e7bdc5b8bae2a62e9ce3e313dc6a3ecb402c7acdd5fb" - }, - "x86_64_windows": { - "checksum": "980bfca9db2ca58b8b6e8e5542863523b63deb29bff09c5dfee698aea90dab64" - } - }, - "0.9.16": { - "x86_64_linux_gnu": { - "checksum": "64889b60a9d13082b2848c262072bf113635c70a71b89656e7d9848dbb10f58b" - }, - "x86_64_macos": { - "checksum": "ce7b3cba9267ba10dfed2416ae2cf9f2c3e5c5c328f4bf80818cd7c1dbd8db24" - }, - "x86_64_windows": { - "checksum": "e14b2295530642d70cd327d119300ed566bf58daa2a05176c2c8ff213c3c3df0" - } - }, - "0.9.15": { - "x86_64_linux_gnu": { - "checksum": "d80d666195a97d0e41c371f7e763855475d08d9a5209aa5302598d926bbb590c" - }, - "x86_64_macos": { - "checksum": "db2f8277edeb9f41016422480d120c6c98390fd4c5551b1960ac2e1f04466499" - }, - "x86_64_windows": { - "checksum": "2ead3aa0a4bfe8a400240bd71b6e512c5c344c2e678dd6fe5b2c99b70ddc7b28" - } - }, - "0.9.14": { - "x86_64_linux_gnu": { - "checksum": "42bcff26fec36c213371108cbf1c7d5baeccf3ae84f4f177db222d59268db417" - }, - "x86_64_macos": { - "checksum": "a4de96f85fe863900f297639c4acdc3bd0b3bed2de181bb9a0a83b80bca090dd" - }, - "x86_64_windows": { - "checksum": "03e5185732b1807629510e5d8c29764a144af3ffe81b0ab0c8522ad91a492653" - } - }, - "0.9.13": { - "x86_64_linux_gnu": { - "checksum": "299338ee9dba31b1b1df06142ce6fbfb3388f42b5047b33bc6f83db1b903a6b8" - }, - "x86_64_macos": { - "checksum": "293d07de124fe58b19e464b4234554d7d24ad46c7131a029588525e95813bd27" - }, - "x86_64_windows": { - "checksum": "f00b5fa66b4677360c3849069b91c25b580d3980609fdc5dc0cef3174402fa10" - } - }, - "0.9.12": { - "x86_64_linux_gnu": { - "checksum": "62a3bd60304f031a9e8de2eb5359ac709bbf43c979b2885cf719ee6982925a1b" - }, - "x86_64_macos": { - "checksum": "59a98b67718f57878f034562fbcfcccdad38cd276cb989eaf66197c3194aa20a" - }, - "x86_64_windows": { - "checksum": "bc0d2c77602fae21981ca5ea1f7577385c7bad6becd40d02a7e8f850ec647a3c" - } - }, - "0.9.11": { - "x86_64_linux_gnu": { - "checksum": "edf8b5de7ae39fc1f7c1a5696f92fecee67ea40eb2937b707c026421cd2b0ef7" - }, - "x86_64_macos": { - "checksum": "13062f0d363bdcfebb6711726f3f376f6b96f6d618f003bc9deb62eff177b5c6" - }, - "x86_64_windows": { - "checksum": "f50546bc2e870a6d700866daed0e754f7911070f3bf15168e22aa7e394006d68" - } - }, - "0.9.10": { - "x86_64_linux_gnu": { - "checksum": "72f2452beab162849800e451f002b7b666599c1fbf48ba0f1e4e1f66d1a3f964" - }, - "x86_64_macos": { - "checksum": "9defd432c28d0c4639722e18f2d0b30cfcbc3d40d0da979484029bf3fb37bfe8" - }, - "x86_64_windows": { - "checksum": "a0b3f050813f9c4e9342e96806fe3f58b40cd21070bf6e975c8b9c32022f0c7c" - } - }, - "0.9.9": { - "x86_64_linux_gnu": { - "checksum": "a68f660fc632ba9f56d34c108e12268c776b3a4af12e4a57919defea2749a4fb" - }, - "x86_64_macos": { - "checksum": "68fabfb452ea3da2631867528342d76c7d22e65eb5729dcf2001b529377465ff" - }, - "x86_64_windows": { - "checksum": "cfb61967039f6378e78ceb494212782ef484b4014cd267fd48c3aa6562b9ed9f" - } - }, - "0.9.8": { - "x86_64_linux_gnu": { - "checksum": "9f2bcac8b65bafb12573b0106db48b29d9ceba4acaa351cc5f2504d38245de61" - }, - "x86_64_macos": { - "checksum": "56962fcebf7af87de9c3c24d161a4849fa5274e4ca1d5efa4901849f15efae1d" - }, - "x86_64_windows": { - "checksum": "0ed3100d1b29c0475f5784556ac024556b7984a95abffc10c4e80300d525b31d" - } - }, - "0.9.7": { - "x86_64_linux_gnu": { - "checksum": "f837faa4e747a82f73f01e735dc9304e64bda55adcf857b9448158d1817cafbc" - }, - "x86_64_macos": { - "checksum": "59d144fc093c344a82ebda600c06c97ae423a0ce1346a0bab44d38e220843a59" - }, - "x86_64_windows": { - "checksum": "1a248d7ee61fc353638b249c2ab57a5f34ee06a1b31ad181a1d82c7d7766079a" - } - }, - "0.9.6": { - "x86_64_linux_gnu": { - "checksum": "de73c56b53a96dbdbb0625727cd7296afebfc3b3b561310330732aefd20808bf" - }, - "x86_64_macos": { - "checksum": "90bad8022768b6a5a8980cc715208568a578b88305ff3b11bd06360fe1398429" - }, - "x86_64_windows": { - "checksum": "a8963ab448155f49476bd27f8e47313de5b5c4fea01ae1e08d493aafbaa6d086" - } - }, - "0.9.5": { - "x86_64_linux_gnu": { - "checksum": "170abd2e313faab81ff5f9a029feec552fed6f9131790206554870a8e33ff6ab" - }, - "x86_64_macos": { - "checksum": "714d8406f729b776a6dd50f3e48e1ca7d45481a7ed172bcbfe6feacd08074d8b" - }, - "x86_64_windows": { - "checksum": "a4b56f8b88c9d4a2f0aeef5f07e80029eaec5df8a5f996f4bcad8cf258c25283" - } - }, - "0.9.4": { - "x86_64_linux_gnu": { - "checksum": "08b9c483c5a7a1fdc15375a1ea061f79e1a08670e77912f7943852215e3da4f6" - }, - "x86_64_macos": { - "checksum": "58ec77643a8f395a989491763841434863fa1f9c5d622b6dcdf5278512217995" - }, - "x86_64_windows": { - "checksum": "1eb8ebd4d1790e18ace38436549ac14c9cbc7c42431fcd6de5a04c3db753155c" - } - } -} diff --git a/tools/ci/tool-list.sh b/tools/ci/tool-list.sh index 55eb03f8..8b32a203 100755 --- a/tools/ci/tool-list.sh +++ b/tools/ci/tool-list.sh @@ -113,9 +113,9 @@ case "${host_os}" in esac # cargo-watch/watchexec-cli is supported by cargo-binstall (through quickinstall) case "${version}" in - latest) tools+=(cargo-watch watchexec-cli) ;; - major.minor.patch) tools+=(cargo-watch@8.1.1 watchexec-cli@1.20.5) ;; - major.minor) tools+=(cargo-watch@8.1 watchexec-cli@1.20) ;; + latest) tools+=(cargo-watch watchexec-cli nextest) ;; + major.minor.patch) tools+=(cargo-watch@8.1.1 watchexec-cli@1.20.5 nextest@0.9.57) ;; + major.minor) tools+=(cargo-watch@8.1 watchexec-cli@1.20 nextest@0.9) ;; major) tools+=(cargo-watch@8 watchexec-cli@1) ;; *) exit 1 ;; esac diff --git a/tools/codegen/base/cargo-nextest.json b/tools/codegen/base/cargo-nextest.json deleted file mode 100644 index 2250ba80..00000000 --- a/tools/codegen/base/cargo-nextest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "repository": "https://github.com/nextest-rs/nextest", - "tag_prefix": "cargo-nextest-", - "rust_crate": "${package}", - "asset_name": "${package}-${version}-${rust_target}.tar.gz", - "platform": { - "x86_64_linux_gnu": {}, - "x86_64_linux_musl": {}, - "x86_64_macos": { - "asset_name": "${package}-${version}-universal-apple-darwin.tar.gz" - }, - "x86_64_windows": {}, - "aarch64_linux_gnu": {} - }, - "prefer_linux_gnu": true -} diff --git a/tools/codegen/src/main.rs b/tools/codegen/src/main.rs index 1f8df6b4..8ae6d4e3 100644 --- a/tools/codegen/src/main.rs +++ b/tools/codegen/src/main.rs @@ -242,18 +242,16 @@ fn main() -> Result<()> { eprintln!("no release asset for {package} {version}"); continue; } - if !base_info.prefer_linux_gnu { - // compact manifest - if download_info.contains_key(&HostPlatform::x86_64_linux_gnu) - && download_info.contains_key(&HostPlatform::x86_64_linux_musl) - { - download_info.remove(&HostPlatform::x86_64_linux_gnu); - } - if download_info.contains_key(&HostPlatform::aarch64_linux_gnu) - && download_info.contains_key(&HostPlatform::aarch64_linux_musl) - { - download_info.remove(&HostPlatform::aarch64_linux_gnu); - } + // compact manifest + if download_info.contains_key(&HostPlatform::x86_64_linux_gnu) + && download_info.contains_key(&HostPlatform::x86_64_linux_musl) + { + download_info.remove(&HostPlatform::x86_64_linux_gnu); + } + if download_info.contains_key(&HostPlatform::aarch64_linux_gnu) + && download_info.contains_key(&HostPlatform::aarch64_linux_musl) + { + download_info.remove(&HostPlatform::aarch64_linux_gnu); } if download_info.contains_key(&HostPlatform::x86_64_macos) && download_info.contains_key(&HostPlatform::aarch64_macos) @@ -331,21 +329,19 @@ fn main() -> Result<()> { if latest_manifest.download_info.contains_key(&p) { continue; } - if !base_info.prefer_linux_gnu { - if p == HostPlatform::x86_64_linux_gnu - && latest_manifest - .download_info - .contains_key(&HostPlatform::x86_64_linux_musl) - { - continue; - } - if p == HostPlatform::aarch64_linux_gnu - && latest_manifest - .download_info - .contains_key(&HostPlatform::aarch64_linux_musl) - { - continue; - } + if p == HostPlatform::x86_64_linux_gnu + && latest_manifest + .download_info + .contains_key(&HostPlatform::x86_64_linux_musl) + { + continue; + } + if p == HostPlatform::aarch64_linux_gnu + && latest_manifest + .download_info + .contains_key(&HostPlatform::aarch64_linux_musl) + { + continue; } bail!( "platform list in base manifest for {package} contains {p:?}, \ @@ -649,9 +645,6 @@ struct BaseManifest { /// Path to binary in archive. Default to `${tool}${exe}`. bin: Option, platform: BTreeMap, - /// Use glibc build if host_env is gnu. - #[serde(default)] - prefer_linux_gnu: bool, version_range: Option, } diff --git a/tools/publish.sh b/tools/publish.sh index 7be1bce1..486631c0 100755 --- a/tools/publish.sh +++ b/tools/publish.sh @@ -106,10 +106,8 @@ tools=() for tool in tools/codegen/base/*.json; do tools+=("$(basename "${tool%.*}")") done -# Aliases -tools+=(nextest) # Not manifest-based -tools+=(valgrind) +tools+=(valgrind nextest cargo-nextest) ( set -x