Merge pull request #34 from actions-rust-lang/rel-180

Using rustup override set will override a local rust-toolchain.toml file
while rustup default will not.

.github/workflows/ci.yml

@@ -1,66 +1,106 @@
-
 name: CI
 
 on:
-  push:
+  push: { branches: [main] }
   pull_request:
   schedule: [cron: "40 1 * * *"]
 
 jobs:
   install:
-    name: Rust ${{matrix.rust}} ${{matrix.os}}
+    name: Rust ${{matrix.rust || '(default)'}} (toolchain-file=${{matrix.write-toolchain-file}}) (${{matrix.os}})
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
+      max-parallel: 5
       matrix:
-        rust: [
-          # Test with toolchain file override
-          "1.60",
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+        write-toolchain-file:
+          - false
+          - true
+        rust:
+          # use stable toolchain as default
+          - null
+
           # Test that the sparse registry check works.
           # 1.66 and 1.67 don't support stable sparse registry.
-          "1.66",
-          "nightly",
-          "beta",
-          "stable",
-        ]
-        os: [
-          "ubuntu-latest",
-          "windows-latest",
-          "macos-latest",
-        ]
+          - "1.66"
+
+          - "nightly"
+          - "beta"
+          - "stable"
     steps:
       - uses: actions/checkout@v4
+
       # Test toolchain file support
       - name: Write rust-toolchain.toml
+        if: matrix.write-toolchain-file
+        shell: bash
         run: |
           cat <<EOF >>rust-toolchain.toml
           [toolchain]
-          channel = "nightly-2022-09-10"
+          channel = "nightly-2024-01-10"
           components = [ "rustfmt", "rustc-dev" ]
           targets = [ "wasm32-unknown-unknown", "thumbv7m-none-eabi" ]
           profile = "minimal"
           EOF
-        shell: bash
-        if: matrix.rust == '1.60'
 
-      - uses: ./
-        name: Run actions-rust-lang/setup-rust-toolchain ${{matrix.rust}}
-        id: toolchain
+      - id: toolchain
+        name: Run actions-rust-lang/setup-rust-toolchain ${{matrix.rust || 'on toolchain file'}}
+        uses: ./
         with:
           toolchain: ${{matrix.rust}}
           components: clippy
+
       - name: Check ${{'${{steps.toolchain.outputs.rustc-version}}'}}
         run: echo '${{steps.toolchain.outputs.rustc-version}}'
+
       - name: Check ${{'${{steps.toolchain.outputs.cargo-version}}'}}
         run: echo '${{steps.toolchain.outputs.cargo-version}}'
+
       - name: Check ${{'${{steps.toolchain.outputs.rustup-version}}'}}
         run: echo '${{steps.toolchain.outputs.rustup-version}}'
-      - run: rustc --version && cargo --version
+
+      - name: Check lack of toolchain input or file results in stable
+        if: matrix.write-toolchain-file == false && matrix.rust == null
         shell: bash
+        run: |-
+          rustcv="$(rustc --version)"
+          [[ "$rustcv" != *"nightly"* && "$rustcv" != *"beta"* ]]
+
+      - name: Check toolchain file is being overridden
+        if: matrix.write-toolchain-file
+        shell: bash
+        run: |-
+          rustcv="$(rustc --version)"
+          [[ ! ( "$rustcv" == *"nightly"* && "$rustcv" == *"2024-01-10"* ) ]]
+
+      - shell: bash
+        run: rustc --version && cargo --version
 
       # Test with creating a small project
       - run: cargo init . --bin --name ci
+
       # Add tiny empty crate.
       # This checks that registry access works.
       - run: cargo add serde_as
+
       - run: cargo clippy
+
+  cache:
+    name: Cache
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: ./
+        with:
+          components: clippy
+          cache: true
+          cache-workspaces: |-
+            ./test-workspace
+
+      - run: cargo clippy --manifest-path=./test-workspace/Cargo.toml

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.0] - 2024-01-13
+
+* Allow specifying subdirectories for cache.
+* Fix toolchain file overriding.
+
+## [1.7.0] - 2024-01-11
+
+* Allow overriding the toolchain file with explicit `toolchain` input. (#26)
+
 ## [1.6.0] - 2023-12-04
 
 ### Added

README.md

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - run: cargo test --all-features
- 
+
   # Check formatting with rustfmt
   formatting:
     name: cargo fmt
@@ -42,18 +42,21 @@ jobs:
 ## Inputs
 
 All inputs are optional.
-If a [toolchain file](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) (i.e., `rust-toolchain` or `rust-toolchain.toml`) is found in the root of the repository, its `toolchain` value takes precedence.
+If a [toolchain file](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) (i.e., `rust-toolchain` or `rust-toolchain.toml`) is found in the root of the repository and no `toolchain` value is provided, all items specified in the toolchain file will be installed.
+If a `toolchain` value is provided, the toolchain file will be ignored.
+If no `toolchain` value or toolchain file is present, it will default to `stable`.
 First, all items specified in the toolchain file are installed.
 Afterward, the `components` and `target` specified via inputs are installed in addition to the items from the toolchain file.
 
-| Name         | Description                                                                            | Default       |
-| ------------ | -------------------------------------------------------------------------------------- | ------------- |
-| `toolchain`  | Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`.                         | stable        |
-| `target`     | Additional target support to install e.g. `wasm32-unknown-unknown`                     |               |
-| `components` | Comma-separated string of additional components to install e.g. `clippy, rustfmt`      |               |
-| `cache`      | Automatically configure Rust cache (using `Swatinem/rust-cache`)                       | true          |
-| `matcher`    | Enable problem matcher to surface build messages and formatting issues                 | true          |
-| `rustflags`  | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags) | "-D warnings" |
+| Name               | Description                                                                            | Default       |
+|--------------------|----------------------------------------------------------------------------------------|---------------|
+| `toolchain`        | Rustup toolchain specifier e.g. `stable`, `nightly`, `1.42.0`.                         | stable        |
+| `target`           | Additional target support to install e.g. `wasm32-unknown-unknown`                     |               |
+| `components`       | Comma-separated string of additional components to install e.g. `clippy, rustfmt`      |               |
+| `cache`            | Automatically configure Rust cache (using `Swatinem/rust-cache`)                       | true          |
+| `cache-workspaces` | Propagates the value to `Swatinem/rust-cache`                                          |               |
+| `matcher`          | Enable problem matcher to surface build messages and formatting issues                 | true          |
+| `rustflags`        | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags) | "-D warnings" |
 
 ### RUSTFLAGS
 

action.yml

@@ -15,7 +15,6 @@ inputs:
   toolchain:
     description: "Rust toolchain specification -- see https://rust-lang.github.io/rustup/concepts/toolchains.html#toolchain-specification"
     required: false
-    default: "stable"
   target:
     description: "Target triple to install for this toolchain"
     required: false
@@ -26,6 +25,9 @@ inputs:
     description: "Automatically configure Rust cache"
     required: false
     default: "true"
+  cache-workspaces:
+    description: "Paths to multiple Cargo workspaces and their target directories, separated by newlines."
+    required: false
   matcher:
     description: "Enable the Rust problem matcher"
     required: false
@@ -60,17 +62,21 @@ runs:
       shell: bash
 
     - id: flags
+      env:
+        targets: ${{inputs.target}}
+        components: ${{inputs.components}}
+      shell: bash
       run: |
         : construct rustup command line
         echo "targets=$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)" >> $GITHUB_OUTPUT
         echo "components=$(for c in ${components//,/ }; do echo -n ' --component' $c; done)" >> $GITHUB_OUTPUT
         echo "downgrade=${{inputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}" >> $GITHUB_OUTPUT
-      env:
-        targets: ${{inputs.target}}
-        components: ${{inputs.components}}
-      shell: bash
+
     # The environment variables always need to be set before the caching action
-    - name: "Setting Environment Variables"
+    - name: Setting Environment Variables
+      env:
+        NEW_RUSTFLAGS: ${{inputs.rustflags}}
+      shell: bash
       run: |
         if [[ ! -v CARGO_INCREMENTAL ]]; then
           echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
@@ -96,25 +102,29 @@ runs:
         if [[ ! -v CARGO_REGISTRIES_CRATES_IO_PROTOCOL ]]; then
           echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $GITHUB_ENV
         fi
-      shell: bash
-      env:
-        NEW_RUSTFLAGS: ${{inputs.rustflags}}
-    - name: "Install Rust Problem Matcher"
+
+    - name: Install Rust Problem Matcher
       if: inputs.matcher == 'true'
-      run: echo "::add-matcher::${{ github.action_path }}/rust.json"
       shell: bash
+      run: echo "::add-matcher::${{ github.action_path }}/rust.json"
 
     - name: Install rustup, if needed
+      if: runner.os != 'Windows'
+      shell: bash
       run: |
         if ! command -v rustup &> /dev/null ; then
           curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
           echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
         fi
-      if: runner.os != 'Windows'
+
+    - name: rustup toolchain install ${{inputs.toolchain || 'stable'}}
+      env:
+        toolchain: ${{inputs.toolchain}}
+        targets: ${{inputs.target}}
+        components: ${{inputs.components}}
       shell: bash
-    - name: rustup toolchain install ${{inputs.toolchain}}
       run: |
-        if [[ -f "rust-toolchain" || -f "rust-toolchain.toml" ]]
+        if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml" ) ]]
         then
           # Install the toolchain as specified in the file
           # Might break at some point: https://github.com/rust-lang/rustup/issues/1397
@@ -126,16 +136,17 @@ runs:
             rustup target add ${targets//,/ }
           fi
         else
-          rustup toolchain install ${{inputs.toolchain}}${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update
-          rustup default ${{inputs.toolchain}}
+          if [[ -z "$toolchain" ]]
+          then
+            toolchain=stable
+          fi
+          rustup toolchain install $toolchain${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update
+          rustup override set $toolchain
         fi
-      env:
-        targets: ${{inputs.target}}
-        components: ${{inputs.components}}
-      shell: bash
 
-    - name: Print installed versions
-      id: versions
+    - id: versions
+      name: Print installed versions
+      shell: bash
       run: |
         echo "rustc-version=$(rustc --version)" >> $GITHUB_OUTPUT
         rustc --version --verbose
@@ -147,9 +158,9 @@ runs:
         DATE=$(rustc --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
         HASH=$(rustc --version --verbose | sed -ne 's/^commit-hash: //p')
         echo "cachekey=$(echo $DATE$HASH | head -c12)" >> $GITHUB_OUTPUT
-      shell: bash
 
-    - name: "Downgrade registry access protocol when needed"
+    - name: Downgrade registry access protocol when needed
+      shell: bash
       run: |
         # Not all versions support setting CARGO_REGISTRIES_CRATES_IO_PROTOCOL
         # On versions 1.66, 1.67, and 1.68.0-nightly the value "sparse" is still unstable.
@@ -159,8 +170,9 @@ runs:
           echo "Downgrade cargo registry protocol to git"
           echo "CARGO_REGISTRIES_CRATES_IO_PROTOCOL=git" >> $GITHUB_ENV
         fi
-      shell: bash
 
-    - name: "Setup Rust Caching"
+    - name: Setup Rust Caching
       if: inputs.cache == 'true'
       uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: ${{inputs.cache-workspaces}}

test-workspace/Cargo.lock

@@ -0,0 +1,16 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ci"
+version = "0.1.0"
+dependencies = [
+ "serde_as",
+]
+
+[[package]]
+name = "serde_as"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee4afe4c5c3b69699c4267ae42b838e911466d7ca0005046adc93ac95bb16dd"

test-workspace/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "ci"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde_as = "0.0.1"

test-workspace/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}