Skip to content

Commit 9fa7c33

Browse files
authored
Merge pull request #11 from actions-rust-lang/tweak-regex
2 parents c7c759a + 5f4f30a commit 9fa7c33

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
[toolchain]
3838
channel = "nightly-2022-09-10"
3939
components = [ "rustfmt", "rustc-dev" ]
40-
targets = [ "wasm32-unknown-unknown", "thumbv2-none-eabi" ]
40+
targets = [ "wasm32-unknown-unknown", "thumbv7m-none-eabi" ]
4141
profile = "minimal"
4242
EOF
4343
shell: bash

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.4.2] - 2023-02-15
11+
12+
### Fixed
13+
14+
* Tweak sparse registry version regex to better work with 1.68 nightly versions.
15+
* Fix command not found issue
16+
1017
## [1.4.1] - 2023-02-13
1118

1219
### Fixed

action.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ runs:
131131
- name: "Enable cargo sparse registry on stable"
132132
run: |
133133
# except on 1.66 and 1.67, on which it is unstable
134+
# Not all 1.68.0-nightly versions support it either
135+
# https://github.com/dtolnay/rust-toolchain/pull/69#discussion_r1107268108
134136
if [[ ! -v CARGO_REGISTRIES_CRATES_IO_PROTOCOL ]]; then
135-
if echo "${{steps.versions.outputs.rustc-version}}" | not grep -q '^rustc 1\.6[67]\.'; then
137+
if echo "${{steps.versions.outputs.rustc-version}}" | grep --invert --quiet '^rustc \(1\.6[67]\.\|1\.68\.0-nightly\)'; then
136138
echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV
137139
fi
138140
fi

0 commit comments

Comments
 (0)