Skip to content

📌 Pin Clippy to a nightly 📌 #6401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 11, 2020
Merged

📌 Pin Clippy to a nightly 📌 #6401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
613333a
Pin Clippy to a nightly
ebroto Nov 29, 2020
2e8b00a
Apply suggestions from PR review
ebroto Dec 9, 2020
77a32eb
Use new cache key
ebroto Dec 9, 2020
20d84fd
Enable internal lints for every test in CI
flip1995 Dec 10, 2020
41cab83
Fix toolchain installation in workflows
flip1995 Dec 10, 2020
26dcbf5
Stop caching on CI
flip1995 Dec 10, 2020
3f41fe2
Error in integration test, if required toolchain is not installed
flip1995 Dec 10, 2020
836325e
Fix integration test runner
flip1995 Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .github/workflows/clippy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,11 @@ jobs:
with:
github_token: "${{ secrets.github_token }}"

- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal

- name: Checkout
uses: actions/[email protected]

- name: Run cargo update
run: cargo update
- name: Install toolchain
run: rustup show active-toolchain
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we remove the rust-toolchain step, from where does the rustup used in this command come from?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GHA ships with stable rust+rustup already installed. See GHA documentation about the pre-installed software

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's convenient :)

BTW thanks for the work on this, you saved me another night fighting the CI 😄

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NP, I like CI pain 😄

So can we merge this? :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! I was hesitant about approving a PR I opened 😄


- name: Cache cargo dir
uses: actions/cache@v2
Expand Down Expand Up @@ -99,5 +92,5 @@ jobs:
# Cleanup
- name: Run cargo-cache --autoclean
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
40 changes: 10 additions & 30 deletions .github/workflows/clippy_bors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
github_token: "${{ secrets.github_token }}"

- name: Checkout
uses: actions/[email protected]
with:
Expand Down Expand Up @@ -84,18 +85,11 @@ jobs:
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
if: matrix.host == 'i686-unknown-linux-gnu'

- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: ${{ matrix.host }}
profile: minimal

- name: Checkout
uses: actions/[email protected]

- name: Run cargo update
run: cargo update
- name: Install toolchain
run: rustup show active-toolchain

- name: Cache cargo dir
uses: actions/cache@v2
Expand Down Expand Up @@ -153,7 +147,7 @@ jobs:
# Cleanup
- name: Run cargo-cache --autoclean
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

integration_build:
Expand All @@ -166,18 +160,11 @@ jobs:
with:
github_token: "${{ secrets.github_token }}"

- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal

- name: Checkout
uses: actions/[email protected]

- name: Run cargo update
run: cargo update
- name: Install toolchain
run: rustup show active-toolchain

- name: Cache cargo dir
uses: actions/cache@v2
Expand Down Expand Up @@ -209,7 +196,7 @@ jobs:
# Cleanup
- name: Run cargo-cache --autoclean
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
integration:
needs: integration_build
Expand Down Expand Up @@ -244,18 +231,11 @@ jobs:
with:
github_token: "${{ secrets.github_token }}"

- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal

- name: Checkout
uses: actions/[email protected]

- name: Run cargo update
run: cargo update
- name: Install toolchain
run: rustup show active-toolchain

- name: Cache cargo dir
uses: actions/cache@v2
Expand Down Expand Up @@ -285,7 +265,7 @@ jobs:
# Cleanup
- name: Run cargo-cache --autoclean
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

# These jobs doesn't actually test anything, but they're only used to tell
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/clippy_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ jobs:

steps:
# Setup
- name: Checkout
uses: actions/[email protected]

- name: remove toolchain file
run: rm rust-toolchain

- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal
components: rustfmt

- name: Checkout
uses: actions/[email protected]
default: true

# Run
- name: Build
Expand Down