mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-27 23:20:39 +00:00
Fix toolchain installation in workflows
This commit is contained in:
parent
20d84fdd98
commit
41cab83fdb
3 changed files with 20 additions and 43 deletions
13
.github/workflows/clippy.yml
vendored
13
.github/workflows/clippy.yml
vendored
|
@ -35,18 +35,11 @@ jobs:
|
||||||
with:
|
with:
|
||||||
github_token: "${{ secrets.github_token }}"
|
github_token: "${{ secrets.github_token }}"
|
||||||
|
|
||||||
- name: rust-toolchain
|
|
||||||
uses: actions-rs/toolchain@v1.0.6
|
|
||||||
with:
|
|
||||||
toolchain: nightly
|
|
||||||
target: x86_64-unknown-linux-gnu
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: Run cargo update
|
- name: Install toolchain
|
||||||
run: cargo update
|
run: rustup show active-toolchain
|
||||||
|
|
||||||
- name: Cache cargo dir
|
- name: Cache cargo dir
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
|
@ -99,5 +92,5 @@ jobs:
|
||||||
# Cleanup
|
# Cleanup
|
||||||
- name: Run cargo-cache --autoclean
|
- name: Run cargo-cache --autoclean
|
||||||
run: |
|
run: |
|
||||||
cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
cargo install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
||||||
cargo cache
|
cargo cache
|
||||||
|
|
40
.github/workflows/clippy_bors.yml
vendored
40
.github/workflows/clippy_bors.yml
vendored
|
@ -23,6 +23,7 @@ jobs:
|
||||||
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
|
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
|
||||||
with:
|
with:
|
||||||
github_token: "${{ secrets.github_token }}"
|
github_token: "${{ secrets.github_token }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
with:
|
with:
|
||||||
|
@ -84,18 +85,11 @@ jobs:
|
||||||
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
|
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
|
||||||
if: matrix.host == 'i686-unknown-linux-gnu'
|
if: matrix.host == 'i686-unknown-linux-gnu'
|
||||||
|
|
||||||
- name: rust-toolchain
|
|
||||||
uses: actions-rs/toolchain@v1.0.6
|
|
||||||
with:
|
|
||||||
toolchain: nightly
|
|
||||||
target: ${{ matrix.host }}
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: Run cargo update
|
- name: Install toolchain
|
||||||
run: cargo update
|
run: rustup show active-toolchain
|
||||||
|
|
||||||
- name: Cache cargo dir
|
- name: Cache cargo dir
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
|
@ -153,7 +147,7 @@ jobs:
|
||||||
# Cleanup
|
# Cleanup
|
||||||
- name: Run cargo-cache --autoclean
|
- name: Run cargo-cache --autoclean
|
||||||
run: |
|
run: |
|
||||||
cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
cargo install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
||||||
cargo cache
|
cargo cache
|
||||||
|
|
||||||
integration_build:
|
integration_build:
|
||||||
|
@ -166,18 +160,11 @@ jobs:
|
||||||
with:
|
with:
|
||||||
github_token: "${{ secrets.github_token }}"
|
github_token: "${{ secrets.github_token }}"
|
||||||
|
|
||||||
- name: rust-toolchain
|
|
||||||
uses: actions-rs/toolchain@v1.0.6
|
|
||||||
with:
|
|
||||||
toolchain: nightly
|
|
||||||
target: x86_64-unknown-linux-gnu
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: Run cargo update
|
- name: Install toolchain
|
||||||
run: cargo update
|
run: rustup show active-toolchain
|
||||||
|
|
||||||
- name: Cache cargo dir
|
- name: Cache cargo dir
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
|
@ -209,7 +196,7 @@ jobs:
|
||||||
# Cleanup
|
# Cleanup
|
||||||
- name: Run cargo-cache --autoclean
|
- name: Run cargo-cache --autoclean
|
||||||
run: |
|
run: |
|
||||||
cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
cargo install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
||||||
cargo cache
|
cargo cache
|
||||||
integration:
|
integration:
|
||||||
needs: integration_build
|
needs: integration_build
|
||||||
|
@ -244,18 +231,11 @@ jobs:
|
||||||
with:
|
with:
|
||||||
github_token: "${{ secrets.github_token }}"
|
github_token: "${{ secrets.github_token }}"
|
||||||
|
|
||||||
- name: rust-toolchain
|
|
||||||
uses: actions-rs/toolchain@v1.0.6
|
|
||||||
with:
|
|
||||||
toolchain: nightly
|
|
||||||
target: x86_64-unknown-linux-gnu
|
|
||||||
profile: minimal
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: Run cargo update
|
- name: Install toolchain
|
||||||
run: cargo update
|
run: rustup show active-toolchain
|
||||||
|
|
||||||
- name: Cache cargo dir
|
- name: Cache cargo dir
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
|
@ -285,7 +265,7 @@ jobs:
|
||||||
# Cleanup
|
# Cleanup
|
||||||
- name: Run cargo-cache --autoclean
|
- name: Run cargo-cache --autoclean
|
||||||
run: |
|
run: |
|
||||||
cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
cargo install cargo-cache --no-default-features --features ci-autoclean cargo-cache
|
||||||
cargo cache
|
cargo cache
|
||||||
|
|
||||||
# These jobs doesn't actually test anything, but they're only used to tell
|
# These jobs doesn't actually test anything, but they're only used to tell
|
||||||
|
|
10
.github/workflows/clippy_dev.yml
vendored
10
.github/workflows/clippy_dev.yml
vendored
|
@ -22,6 +22,12 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# Setup
|
# Setup
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
|
- name: remove toolchain file
|
||||||
|
run: rm rust-toolchain
|
||||||
|
|
||||||
- name: rust-toolchain
|
- name: rust-toolchain
|
||||||
uses: actions-rs/toolchain@v1.0.6
|
uses: actions-rs/toolchain@v1.0.6
|
||||||
with:
|
with:
|
||||||
|
@ -29,9 +35,7 @@ jobs:
|
||||||
target: x86_64-unknown-linux-gnu
|
target: x86_64-unknown-linux-gnu
|
||||||
profile: minimal
|
profile: minimal
|
||||||
components: rustfmt
|
components: rustfmt
|
||||||
|
default: true
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2.3.3
|
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|
Loading…
Reference in a new issue