Merge pull request #11 from actions-rust-lang/tweak-regex

warning: Force-skipping unavailable component 'rust-std-thumbv2-none-eabi'

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   install:
-    name: Rust ${{matrix.rust}}
+    name: Rust ${{matrix.rust}} ${{matrix.os}}
-    runs-on: ubuntu-latest
+    runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
       matrix:
@@ -23,6 +23,11 @@ jobs:
           "beta",
           "stable",
         ]
+        os: [
+          "ubuntu-latest",
+          "windows-latest",
+          "macos-latest",
+        ]
     steps:
       - uses: actions/checkout@v3
       # Test toolchain file support
@@ -32,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

CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [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
+
+* Fixed running on macOS #9 #10
+    The macOS images have an ancient version of bash, but the action relies on "newer" features than 2014.
+    We install bash via brew (already pre-installed) to have a new enough version.
+
+    The CI is extended to also run on Windows and macOS to catch such issues earlier in the future.
+
+    Thanks to @GeorgeHahn for reporting the issue.
+
 ## [1.4.0] - 2023-02-13
 
 ### Changed

action.yml

@@ -44,6 +44,13 @@ outputs:
 runs:
   using: composite
   steps:
+    # The later code uses "newer" bash features, which are not available in the ancient bash 3 (from 2014) of macOS
+    - name: Unbork mac
+      if: runner.os == 'macOS'
+      run: |
+        brew install bash
+      shell: bash
+
     - id: flags
       run: |
         : construct rustup command line
@@ -124,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