From 2d7b97c05cb6f82e3c2777e8a76b0815f53116ea Mon Sep 17 00:00:00 2001 From: Jonas Bushart Date: Wed, 15 Feb 2023 18:48:31 +0100 Subject: [PATCH 1/2] Tweak sparse registry version regex and command not found These issues are reported again rust-toolchain from which the code is inspired. https://github.com/dtolnay/rust-toolchain/issues/71 https://github.com/dtolnay/rust-toolchain/pull/69#pullrequestreview-1299712112 --- CHANGELOG.md | 7 +++++++ action.yml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e8384..910e674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.4.2] - 2023-02-15 + +### Fixed + +* Tweak sparse registry version regex to better work with 1.68 nightly versions. +* Fix command not found issue + ## [1.4.1] - 2023-02-13 ### Fixed diff --git a/action.yml b/action.yml index 3a4177b..d9704c0 100644 --- a/action.yml +++ b/action.yml @@ -131,8 +131,10 @@ runs: - name: "Enable cargo sparse registry on stable" run: | # except on 1.66 and 1.67, on which it is unstable + # Not all 1.68.0-nightly versions support it either + # https://github.com/dtolnay/rust-toolchain/pull/69#discussion_r1107268108 if [[ ! -v CARGO_REGISTRIES_CRATES_IO_PROTOCOL ]]; then - if echo "${{steps.versions.outputs.rustc-version}}" | not grep -q '^rustc 1\.6[67]\.'; then + if echo "${{steps.versions.outputs.rustc-version}}" | grep --invert --quiet '^rustc \(1\.6[67]\.\|1\.68\.0-nightly\)'; then echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV fi fi From 5f4f30a995525d282f39f0fb5e26406227723a60 Mon Sep 17 00:00:00 2001 From: Jonas Bushart Date: Wed, 15 Feb 2023 19:06:41 +0100 Subject: [PATCH 2/2] Maybe fix rustup warning warning: Force-skipping unavailable component 'rust-std-thumbv2-none-eabi' --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75ed433..f84d14e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: [toolchain] channel = "nightly-2022-09-10" components = [ "rustfmt", "rustc-dev" ] - targets = [ "wasm32-unknown-unknown", "thumbv2-none-eabi" ] + targets = [ "wasm32-unknown-unknown", "thumbv7m-none-eabi" ] profile = "minimal" EOF shell: bash