Skip to content

Commit df0174e

Browse files
authored
Merge pull request #19493 from Veykril/push-tlwonkmlonqv
chore: Disable rust-cache in CI
2 parents cdcadb4 + b2801f9 commit df0174e

File tree

1 file changed

+23
-33
lines changed

1 file changed

+23
-33
lines changed

.github/workflows/ci.yaml

+23-33
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757

5858
# We don't cache this job, as it will be invalidated every day due to nightly usage
5959

60-
- name: Bump opt-level
61-
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
62-
6360
- name: Test
6461
run: cargo test --features sysroot-abi -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api -- --quiet
6562

@@ -97,32 +94,23 @@ jobs:
9794
if: matrix.os == 'ubuntu-latest'
9895
run: echo "::add-matcher::.github/rust.json"
9996

100-
- name: Bump opt-level
101-
if: matrix.os == 'ubuntu-latest'
102-
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
103-
104-
- name: Cache Dependencies
105-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
106-
with:
107-
workspaces: |
108-
. -> target
109-
./crates/proc-macro-srv/proc-macro-test/imp -> target
97+
# - name: Cache Dependencies
98+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
99+
# with:
100+
# workspaces: |
101+
# . -> target
102+
# ./crates/proc-macro-srv/proc-macro-test/imp -> target
110103

111104
- uses: taiki-e/install-action@nextest
112105

113106
- name: Codegen checks (rust-analyzer)
107+
if: matrix.os == 'ubuntu-latest'
114108
run: cargo codegen --check
115109

116110
- name: Compile (tests)
117111
run: cargo test --no-run
118112

119-
# It's faster to `test` before `build` ¯\_(ツ)_/¯
120-
- name: Compile (rust-analyzer)
121-
if: matrix.os == 'ubuntu-latest'
122-
run: cargo build --quiet
123-
124113
- name: Test
125-
if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest' || github.event_name == 'push'
126114
run: cargo nextest run --no-fail-fast --hide-progress-bar --status-level fail
127115

128116
- name: clippy
@@ -131,8 +119,9 @@ jobs:
131119

132120
analysis-stats:
133121
if: github.repository == 'rust-lang/rust-analyzer'
134-
name: miri
135122
runs-on: ubuntu-latest
123+
env:
124+
RUSTC_BOOTSTRAP: 1
136125

137126
steps:
138127
- name: Checkout repository
@@ -144,20 +133,22 @@ jobs:
144133
rustup default stable
145134
rustup component add rustfmt
146135
147-
- name: Cache Dependencies
148-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
136+
# - name: Cache Dependencies
137+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
138+
139+
- name: Bump opt-level
140+
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
141+
142+
- run: cargo build -p rust-analyzer
149143

150144
- name: ./rust-analyzer
151-
run: cargo run -p rust-analyzer -- analysis-stats . -q
145+
run: ./target/debug/rust-analyzer analysis-stats . -q
152146

153147
- name: sysroot/lib/rustlib/src/rust/library/
154-
env:
155-
RUSTC_BOOTSTRAP: 1
156-
run: cargo run -p rust-analyzer -- analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/ -q
148+
run: ./target/debug/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/ -q
157149

158150
rustfmt:
159151
if: github.repository == 'rust-lang/rust-analyzer'
160-
name: miri
161152
runs-on: ubuntu-latest
162153

163154
steps:
@@ -174,7 +165,6 @@ jobs:
174165

175166
miri:
176167
if: github.repository == 'rust-lang/rust-analyzer'
177-
name: miri
178168
runs-on: ubuntu-latest
179169

180170
steps:
@@ -187,8 +177,8 @@ jobs:
187177
rustup default nightly
188178
rustup component add miri
189179
190-
- name: Cache Dependencies
191-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
180+
# - name: Cache Dependencies
181+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
192182

193183
- run: cargo miri test -p intern
194184

@@ -214,8 +204,8 @@ jobs:
214204
rustup update --no-self-update stable
215205
rustup target add ${{ env.targets }} ${{ env.targets_ide }}
216206
217-
- name: Cache Dependencies
218-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
207+
# - name: Cache Dependencies
208+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
219209

220210
- name: Check
221211
run: |
@@ -306,7 +296,7 @@ jobs:
306296
run: typos
307297

308298
conclusion:
309-
needs: [rust, rust-cross, typescript, typo-check, proc-macro-srv, miri]
299+
needs: [rust, rust-cross, typescript, typo-check, proc-macro-srv, miri, rustfmt, analysis-stats]
310300
# We need to ensure this job does *not* get skipped if its dependencies fail,
311301
# because a skipped job is considered a success by GitHub. So we have to
312302
# overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run

0 commit comments

Comments
 (0)