From 402d025565a7124c841a18e5e7c3c8dbe7adb5e0 Mon Sep 17 00:00:00 2001 From: svartalf Date: Sun, 26 Jan 2020 18:25:57 +0300 Subject: [PATCH] Release v1.0.4 --- CHANGELOG.md | 3 ++- README.md | 16 ++++++++++++++-- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a1f7be..a8a7cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,12 @@ 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.0.4] - 2020-01-26 ### Added - Support for the `rust-toolchain` file: If the toolchain input is not given, we will try and install the version specified in the `rust-toolchain` file. +- Action outputs with `rustc`, `cargo` and `rustup` versions installed ## [1.0.3] - 2019-10-19 diff --git a/README.md b/README.md index 08c782c..f2a2460 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ jobs: name: Rust project runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Install latest nightly uses: actions-rs/toolchain@v1 with: @@ -41,13 +41,16 @@ See [additional recipes here](https://github.com/actions-rs/meta). | Name | Required | Description | Type | Default | | ------------ | :------: | ----------------------------------------------------------------------------------------------------------------------------------------------------| ------ | --------| -| `toolchain` | ✓ | [Toolchain](https://github.com/rust-lang/rustup.rs#toolchain-specification) name to use, ex. `stable`, `nightly`, `nightly-2019-04-20`, or `1.32.0` | string | | +| `toolchain` | | [Toolchain](https://github.com/rust-lang/rustup.rs#toolchain-specification) name to use, ex. `stable`, `nightly`, `nightly-2019-04-20`, or `1.32.0` | string | | | `target` | | Additionally install specified target for this toolchain, ex. `x86_64-apple-darwin` | string | | | `default` | | Set installed toolchain as a default toolchain | bool | false | | `override` | | Set installed toolchain as an override for the current directory | bool | false | | `profile` | | Execute `rustup set profile {value}` before installing the toolchain, ex. `minimal` | string | | | `components` | | Comma-separated list of the additional components to install, ex. `clippy, rustfmt` | string | | +Note: since `v1.0.4` version, `toolchain` input is not marked as required +in order to support toolchain files. See the details [below](#the-toolchain-file). + ## Outputs Installed `rustc`, `cargo` and `rustup` versions can be fetched from the Action outputs: @@ -115,6 +118,15 @@ to install the minimal set of `nightly` toolchain components with the `rustfmt` Same to the `profile` input, if the installed `rustup` does not supports "components", it will be automatically upgraded by this Action. +## The toolchain file + +This Action supports [toolchain files](https://github.com/rust-lang/rustup#the-toolchain-file), +so it is not necessary to use `toolchain` input anymore. + +Input has higher priority, so if you are want to use toolchain file, you need to remove the input from the workflow file. + +If neither `toolchain` input or `rust-toolchain` file are provided, Action execution will fail. + ## Notes As `rustup` is not installed by default for [macOS environments](https://help.github.com/en/articles/virtual-environments-for-github-actions) diff --git a/package-lock.json b/package-lock.json index afd54d7..bb5e062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rust-toolchain", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ff891d5..08ff222 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rust-toolchain", - "version": "1.0.3", + "version": "1.0.4", "private": false, "description": "Install the Rust toolchain", "main": "lib/main.js",