Compare commits

..

No commits in common. "master" and "v1.0.6" have entirely different histories.

8 changed files with 5128 additions and 3243 deletions

View File

@ -6,7 +6,7 @@
# This script can yield false positives in cases where you only make stylistic changes to the TypeScript code that don't result in changes to the compiled JavaScript code. # This script can yield false positives in cases where you only make stylistic changes to the TypeScript code that don't result in changes to the compiled JavaScript code.
# It is your responsibility as a developer to then commit the changes with `git commit --no-verify` and simply skip this commit hook. # It is your responsibility as a developer to then commit the changes with `git commit --no-verify` and simply skip this commit hook.
TS_FILES=$(git diff --staged --name-only | grep -c '\.ts$') TS_FILES=$(git diff --staged --name-only | grep -c '.ts')
DIST_MODIFIED=$(git diff --staged --name-only | grep -c dist/index.js) DIST_MODIFIED=$(git diff --staged --name-only | grep -c dist/index.js)
if [ $TS_FILES -gt 0 ] && [ $DIST_MODIFIED -eq 0 ] ; then if [ $TS_FILES -gt 0 ] && [ $DIST_MODIFIED -eq 0 ] ; then

View File

@ -13,8 +13,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- run: npm ci - run: npm ci
# Temporary disabling in order to release urgent fix - run: npm run lint
# - run: npm run lint
- run: npm run build - run: npm run build
- run: npm run test - run: npm run test

View File

@ -4,7 +4,7 @@ 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/), 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.0.6] - 2020-03-24 ## Unreleased
### Added ### Added

View File

@ -6,11 +6,11 @@
![Continuous integration](https://github.com/actions-rs/toolchain/workflows/Continuous%20integration/badge.svg) ![Continuous integration](https://github.com/actions-rs/toolchain/workflows/Continuous%20integration/badge.svg)
![Dependabot enabled](https://api.dependabot.com/badges/status?host=github&repo=actions-rs/toolchain) ![Dependabot enabled](https://api.dependabot.com/badges/status?host=github&repo=actions-rs/toolchain)
This GitHub Action installs [Rust toolchain](https://rust-lang.github.io/rustup/concepts/toolchains.html#toolchain-specification) This GitHub Action installs [Rust toolchain](https://github.com/rust-lang/rustup.rs#toolchain-specification)
with [rustup](https://github.com/rust-lang/rustup) help. with [rustup](https://github.com/rust-lang/rustup) help.
It supports additional targets, components and profiles and handles all It supports additional targets, components and profiles and handles all
these small papercuts for you. these small papercuts from you.
**Table of Contents** **Table of Contents**
@ -58,11 +58,11 @@ See [additional recipes here](https://github.com/actions-rs/meta).
| Name | Required | Description | Type | Default | | 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 | stable | | `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 | | | `target` | | Additionally install specified target for this toolchain, ex. `x86_64-apple-darwin` | string | |
| `default` | | Set installed toolchain as a default toolchain | bool | false | | `default` | | Set installed toolchain as a default toolchain | bool | false |
| `override` | | Set installed toolchain as an override for the current directory | 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 | default | | `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 | | | `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 Note: since `v1.0.4` version, `toolchain` input is not marked as required
@ -79,7 +79,7 @@ Installed `rustc`, `cargo` and `rustup` versions can be fetched from the Action
| `cargo` | Cargo version | `1.40.0 (bc8e4c8be 2019-11-22)` | | `cargo` | Cargo version | `1.40.0 (bc8e4c8be 2019-11-22)` |
| `rustup` | rustup version | `1.21.1 (7832b2ebe 2019-12-20)` | | `rustup` | rustup version | `1.21.1 (7832b2ebe 2019-12-20)` |
Note: `rustc_hash` output value can be used with [actions/cache](https://github.com/actions/cache) Action Note: `rustc-hash` output value can be used with [actions/cache](https://github.com/actions/cache) Action
to store cache for different Rust versions, as it is unique across different Rust versions and builds (including `nightly`). to store cache for different Rust versions, as it is unique across different Rust versions and builds (including `nightly`).
## Profiles ## Profiles
@ -145,7 +145,7 @@ it will be automatically upgraded by this Action.
## The toolchain file ## The toolchain file
This Action supports [toolchain files](https://rust-lang.github.io/rustup/overrides.html#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. so it is not necessary to use `toolchain` input anymore.
Input has higher priority, so if you are want to use toolchain file, Input has higher priority, so if you are want to use toolchain file,

View File

@ -9,7 +9,7 @@ inputs:
description: | description: |
Rust toolchain name. Rust toolchain name.
See https://rust-lang.github.io/rustup/concepts/toolchains.html#toolchain-specification See https://github.com/rust-lang/rustup.rs#toolchain-specification
If this is not given, the action will try and install the version specified in the `rust-toolchain` file. If this is not given, the action will try and install the version specified in the `rust-toolchain` file.
required: false required: false

2
dist/index.js vendored

File diff suppressed because one or more lines are too long

8312
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "rust-toolchain", "name": "rust-toolchain",
"version": "1.0.7", "version": "1.0.6",
"private": false, "private": false,
"description": "Install the Rust toolchain", "description": "Install the Rust toolchain",
"main": "lib/main.js", "main": "lib/main.js",
@ -32,27 +32,27 @@
"url": "https://github.com/actions-rs/toolchain/issues" "url": "https://github.com/actions-rs/toolchain/issues"
}, },
"dependencies": { "dependencies": {
"@actions-rs/core": "^0.1.6", "@actions-rs/core": "^0.0.9",
"@actions/core": "^1.2.6", "@actions/core": "^1.2.3",
"@actions/exec": "^1.0.4", "@actions/exec": "^1.0.3",
"@actions/io": "^1.0.2" "@actions/io": "^1.0.2"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^26.0.15", "@types/jest": "^25.1.4",
"@types/node": "^14.14.7", "@types/node": "^13.9.3",
"@typescript-eslint/eslint-plugin": "^4.8.1", "@typescript-eslint/eslint-plugin": "^2.25.0",
"@typescript-eslint/parser": "^4.8.1", "@typescript-eslint/parser": "^2.25.0",
"@zeit/ncc": "^0.22.3", "@zeit/ncc": "^0.22.0",
"eslint": "^7.13.0", "eslint": "^6.8.0",
"eslint-config-prettier": "^6.15.0", "eslint-config-prettier": "^6.10.1",
"eslint-plugin-prettier": "^3.1.4", "eslint-plugin-prettier": "^3.1.2",
"jest": "^26.6.3", "jest": "^25.1.0",
"jest-circus": "^26.6.3", "jest-circus": "^25.1.0",
"mock-env": "^0.2.0", "mock-env": "^0.2.0",
"npm-check-updates": "^10.2.1", "npm-check-updates": "^4.0.5",
"prettier": "^2.1.2", "prettier": "^2.0.2",
"temp-write": "^4.0.0", "temp-write": "^4.0.0",
"ts-jest": "^26.4.4", "ts-jest": "^25.2.1",
"typescript": "^4.0.5" "typescript": "^3.8.3"
} }
} }