Skip to content

Commit 4936aa3

Browse files
committed
chore: Disable rust-cache in CI
It doesn't actually work with merge groups ...
1 parent cdcadb4 commit 4936aa3

File tree

1 file changed

+19
-31
lines changed

1 file changed

+19
-31
lines changed

.github/workflows/ci.yaml

Lines changed: 19 additions & 31 deletions
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,30 +94,18 @@ 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

113-
- name: Codegen checks (rust-analyzer)
114-
run: cargo codegen --check
115-
116106
- name: Compile (tests)
117107
run: cargo test --no-run
118108

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-
124109
- name: Test
125110
if: matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest' || github.event_name == 'push'
126111
run: cargo nextest run --no-fail-fast --hide-progress-bar --status-level fail
@@ -131,7 +116,6 @@ jobs:
131116

132117
analysis-stats:
133118
if: github.repository == 'rust-lang/rust-analyzer'
134-
name: miri
135119
runs-on: ubuntu-latest
136120

137121
steps:
@@ -144,8 +128,14 @@ jobs:
144128
rustup default stable
145129
rustup component add rustfmt
146130
147-
- name: Cache Dependencies
148-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
131+
# - name: Cache Dependencies
132+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
133+
134+
- name: Bump opt-level
135+
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
136+
137+
- name: Codegen checks (rust-analyzer)
138+
run: cargo codegen --check
149139

150140
- name: ./rust-analyzer
151141
run: cargo run -p rust-analyzer -- analysis-stats . -q
@@ -157,7 +147,6 @@ jobs:
157147

158148
rustfmt:
159149
if: github.repository == 'rust-lang/rust-analyzer'
160-
name: miri
161150
runs-on: ubuntu-latest
162151

163152
steps:
@@ -174,7 +163,6 @@ jobs:
174163

175164
miri:
176165
if: github.repository == 'rust-lang/rust-analyzer'
177-
name: miri
178166
runs-on: ubuntu-latest
179167

180168
steps:
@@ -187,8 +175,8 @@ jobs:
187175
rustup default nightly
188176
rustup component add miri
189177
190-
- name: Cache Dependencies
191-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
178+
# - name: Cache Dependencies
179+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
192180

193181
- run: cargo miri test -p intern
194182

@@ -214,8 +202,8 @@ jobs:
214202
rustup update --no-self-update stable
215203
rustup target add ${{ env.targets }} ${{ env.targets_ide }}
216204
217-
- name: Cache Dependencies
218-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
205+
# - name: Cache Dependencies
206+
# uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
219207

220208
- name: Check
221209
run: |
@@ -306,7 +294,7 @@ jobs:
306294
run: typos
307295

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

0 commit comments

Comments
 (0)