Skip to content

Commit 1c40912

Browse files
committed
chore: Clean CI a bit
1 parent 00191d8 commit 1c40912

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

.github/workflows/ci.yaml

+10-14
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- 'editors/code/**'
3535
3636
proc-macro-srv:
37-
needs: changes
3837
if: github.repository == 'rust-lang/rust-analyzer'
3938
name: proc-macro-srv
4039
runs-on: ubuntu-latest
@@ -89,7 +88,7 @@ jobs:
8988
run: |
9089
rustup update --no-self-update stable
9190
rustup default stable
92-
rustup component add --toolchain stable rust-src
91+
rustup component add --toolchain stable rust-src clippy
9392
# We always use a nightly rustfmt, regardless of channel, because we need
9493
# --file-lines.
9594
rustup toolchain install nightly --profile minimal --component rustfmt
@@ -99,11 +98,11 @@ jobs:
9998
run: echo "::add-matcher::.github/rust.json"
10099

101100
- name: Cache Dependencies
102-
uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844
101+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
103102
with:
104103
workspaces: |
105104
. -> target
106-
crates/proc-macro-srv/proc-macro-test/imp -> target
105+
./crates/proc-macro-srv/proc-macro-test/imp -> target
107106
108107
- uses: taiki-e/install-action@nextest
109108

@@ -126,21 +125,15 @@ jobs:
126125
if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest' || github.event_name == 'push'
127126
run: cargo nextest run --no-fail-fast --hide-progress-bar --status-level fail
128127

129-
- name: Switch to stable toolchain
130-
run: |
131-
rustup update --no-self-update stable
132-
rustup component add --toolchain stable rust-src clippy
133-
rustup default stable
134-
135128
- name: Run analysis-stats on rust-analyzer
136129
if: matrix.os == 'ubuntu-latest'
137-
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats .
130+
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats . -q
138131

139132
- name: Run analysis-stats on the rust standard libraries
140133
if: matrix.os == 'ubuntu-latest'
141134
env:
142135
RUSTC_BOOTSTRAP: 1
143-
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/
136+
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/ -q
144137

145138
- name: clippy
146139
if: matrix.os == 'macos-latest'
@@ -166,7 +159,10 @@ jobs:
166159
rustup component add miri --toolchain nightly
167160
168161
- name: Cache Dependencies
169-
uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609
162+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
163+
with:
164+
workspaces: |
165+
. -> target
170166
171167
- run: cargo +nightly miri test -p intern --locked
172168

@@ -193,7 +189,7 @@ jobs:
193189
rustup target add ${{ env.targets }} ${{ env.targets_ide }}
194190
195191
- name: Cache Dependencies
196-
uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609
192+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
197193

198194
- name: Check
199195
run: |

0 commit comments

Comments
 (0)