Skip to content

Commit 85736ec

Browse files
ConradIrwinConradIrwin
authored
Install sccache *after* we rm-rf target... (zed-industries#49035)
Closes #ISSUE - [ ] Tests or screenshots needed? - [ ] Code Reviewed - [ ] Manual QA Release Notes: - N/A
1 parent deb52aa commit 85736ec

7 files changed

Lines changed: 60 additions & 60 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ jobs:
2626
with:
2727
cache: rust
2828
path: ~/.rustup
29-
- name: steps::setup_sccache
30-
run: ./script/setup-sccache
31-
env:
32-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
33-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
34-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
35-
SCCACHE_BUCKET: sccache-zed
3629
- name: steps::setup_node
3730
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
3831
with:
@@ -41,6 +34,13 @@ jobs:
4134
uses: taiki-e/install-action@nextest
4235
- name: steps::clear_target_dir_if_large
4336
run: ./script/clear-target-dir-if-larger-than 300
37+
- name: steps::setup_sccache
38+
run: ./script/setup-sccache
39+
env:
40+
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
41+
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
42+
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
43+
SCCACHE_BUCKET: sccache-zed
4444
- name: steps::cargo_nextest
4545
run: cargo nextest run --workspace --no-fail-fast
4646
- name: steps::show_sccache_stats
@@ -73,13 +73,6 @@ jobs:
7373
run: ./script/install-mold
7474
- name: steps::download_wasi_sdk
7575
run: ./script/download-wasi-sdk
76-
- name: steps::setup_sccache
77-
run: ./script/setup-sccache
78-
env:
79-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
80-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
81-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
82-
SCCACHE_BUCKET: sccache-zed
8376
- name: steps::setup_node
8477
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
8578
with:
@@ -88,6 +81,13 @@ jobs:
8881
uses: taiki-e/install-action@nextest
8982
- name: steps::clear_target_dir_if_large
9083
run: ./script/clear-target-dir-if-larger-than 250
84+
- name: steps::setup_sccache
85+
run: ./script/setup-sccache
86+
env:
87+
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
88+
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
89+
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
90+
SCCACHE_BUCKET: sccache-zed
9191
- name: steps::cargo_nextest
9292
run: cargo nextest run --workspace --no-fail-fast
9393
- name: steps::show_sccache_stats
@@ -118,6 +118,13 @@ jobs:
118118
New-Item -ItemType Directory -Path "./../.cargo" -Force
119119
Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
120120
shell: pwsh
121+
- name: steps::setup_node
122+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
123+
with:
124+
node-version: '20'
125+
- name: steps::clear_target_dir_if_large
126+
run: ./script/clear-target-dir-if-larger-than.ps1 250
127+
shell: pwsh
121128
- name: steps::setup_sccache
122129
run: ./script/setup-sccache.ps1
123130
shell: pwsh
@@ -126,13 +133,6 @@ jobs:
126133
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
127134
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
128135
SCCACHE_BUCKET: sccache-zed
129-
- name: steps::setup_node
130-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
131-
with:
132-
node-version: '20'
133-
- name: steps::clear_target_dir_if_large
134-
run: ./script/clear-target-dir-if-larger-than.ps1 250
135-
shell: pwsh
136136
- name: steps::cargo_nextest
137137
run: cargo nextest run --workspace --no-fail-fast
138138
shell: pwsh

‎.github/workflows/release_nightly.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ jobs:
3838
New-Item -ItemType Directory -Path "./../.cargo" -Force
3939
Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
4040
shell: pwsh
41+
- name: steps::setup_node
42+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
43+
with:
44+
node-version: '20'
45+
- name: steps::clear_target_dir_if_large
46+
run: ./script/clear-target-dir-if-larger-than.ps1 250
47+
shell: pwsh
4148
- name: steps::setup_sccache
4249
run: ./script/setup-sccache.ps1
4350
shell: pwsh
@@ -46,13 +53,6 @@ jobs:
4653
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
4754
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
4855
SCCACHE_BUCKET: sccache-zed
49-
- name: steps::setup_node
50-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
51-
with:
52-
node-version: '20'
53-
- name: steps::clear_target_dir_if_large
54-
run: ./script/clear-target-dir-if-larger-than.ps1 250
55-
shell: pwsh
5656
- name: steps::cargo_nextest
5757
run: cargo nextest run --workspace --no-fail-fast
5858
shell: pwsh

‎.github/workflows/run_cron_unit_evals.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ jobs:
3939
run: ./script/install-mold
4040
- name: steps::download_wasi_sdk
4141
run: ./script/download-wasi-sdk
42+
- name: steps::cargo_install_nextest
43+
uses: taiki-e/install-action@nextest
44+
- name: steps::clear_target_dir_if_large
45+
run: ./script/clear-target-dir-if-larger-than 250
4246
- name: steps::setup_sccache
4347
run: ./script/setup-sccache
4448
env:
4549
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
4650
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
4751
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
4852
SCCACHE_BUCKET: sccache-zed
49-
- name: steps::cargo_install_nextest
50-
uses: taiki-e/install-action@nextest
51-
- name: steps::clear_target_dir_if_large
52-
run: ./script/clear-target-dir-if-larger-than 250
5353
- name: ./script/run-unit-evals
5454
run: ./script/run-unit-evals
5555
env:

‎.github/workflows/run_tests.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,13 @@ jobs:
252252
New-Item -ItemType Directory -Path "./../.cargo" -Force
253253
Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
254254
shell: pwsh
255+
- name: steps::setup_node
256+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
257+
with:
258+
node-version: '20'
259+
- name: steps::clear_target_dir_if_large
260+
run: ./script/clear-target-dir-if-larger-than.ps1 250
261+
shell: pwsh
255262
- name: steps::setup_sccache
256263
run: ./script/setup-sccache.ps1
257264
shell: pwsh
@@ -260,13 +267,6 @@ jobs:
260267
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
261268
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
262269
SCCACHE_BUCKET: sccache-zed
263-
- name: steps::setup_node
264-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
265-
with:
266-
node-version: '20'
267-
- name: steps::clear_target_dir_if_large
268-
run: ./script/clear-target-dir-if-larger-than.ps1 250
269-
shell: pwsh
270270
- name: steps::cargo_nextest
271271
run: cargo nextest run --workspace --no-fail-fast${{ needs.orchestrate.outputs.changed_packages && format(' -E "{0}"', needs.orchestrate.outputs.changed_packages) || '' }}
272272
shell: pwsh
@@ -304,13 +304,6 @@ jobs:
304304
run: ./script/install-mold
305305
- name: steps::download_wasi_sdk
306306
run: ./script/download-wasi-sdk
307-
- name: steps::setup_sccache
308-
run: ./script/setup-sccache
309-
env:
310-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
311-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
312-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
313-
SCCACHE_BUCKET: sccache-zed
314307
- name: steps::setup_node
315308
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
316309
with:
@@ -319,6 +312,13 @@ jobs:
319312
uses: taiki-e/install-action@nextest
320313
- name: steps::clear_target_dir_if_large
321314
run: ./script/clear-target-dir-if-larger-than 250
315+
- name: steps::setup_sccache
316+
run: ./script/setup-sccache
317+
env:
318+
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
319+
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
320+
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
321+
SCCACHE_BUCKET: sccache-zed
322322
- name: steps::cargo_nextest
323323
run: cargo nextest run --workspace --no-fail-fast${{ needs.orchestrate.outputs.changed_packages && format(' -E "{0}"', needs.orchestrate.outputs.changed_packages) || '' }}
324324
- name: steps::show_sccache_stats
@@ -355,13 +355,6 @@ jobs:
355355
with:
356356
cache: rust
357357
path: ~/.rustup
358-
- name: steps::setup_sccache
359-
run: ./script/setup-sccache
360-
env:
361-
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
362-
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
363-
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
364-
SCCACHE_BUCKET: sccache-zed
365358
- name: steps::setup_node
366359
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
367360
with:
@@ -370,6 +363,13 @@ jobs:
370363
uses: taiki-e/install-action@nextest
371364
- name: steps::clear_target_dir_if_large
372365
run: ./script/clear-target-dir-if-larger-than 300
366+
- name: steps::setup_sccache
367+
run: ./script/setup-sccache
368+
env:
369+
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
370+
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
371+
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
372+
SCCACHE_BUCKET: sccache-zed
373373
- name: steps::cargo_nextest
374374
run: cargo nextest run --workspace --no-fail-fast${{ needs.orchestrate.outputs.changed_packages && format(' -E "{0}"', needs.orchestrate.outputs.changed_packages) || '' }}
375375
- name: steps::show_sccache_stats

‎.github/workflows/run_unit_evals.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ jobs:
4242
run: ./script/install-mold
4343
- name: steps::download_wasi_sdk
4444
run: ./script/download-wasi-sdk
45+
- name: steps::cargo_install_nextest
46+
uses: taiki-e/install-action@nextest
47+
- name: steps::clear_target_dir_if_large
48+
run: ./script/clear-target-dir-if-larger-than 250
4549
- name: steps::setup_sccache
4650
run: ./script/setup-sccache
4751
env:
4852
R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
4953
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
5054
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
5155
SCCACHE_BUCKET: sccache-zed
52-
- name: steps::cargo_install_nextest
53-
uses: taiki-e/install-action@nextest
54-
- name: steps::clear_target_dir_if_large
55-
run: ./script/clear-target-dir-if-larger-than 250
5656
- name: ./script/run-unit-evals
5757
run: ./script/run-unit-evals
5858
env:

‎tooling/xtask/src/tasks/workflows/run_agent_evals.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ fn cron_unit_evals_job() -> Job {
140140
.add_step(steps::setup_cargo_config(Platform::Linux))
141141
.add_step(steps::cache_rust_dependencies_namespace())
142142
.map(steps::install_linux_dependencies)
143-
.add_step(steps::setup_sccache(Platform::Linux))
144143
.add_step(steps::cargo_install_nextest())
145144
.add_step(steps::clear_target_dir_if_large(Platform::Linux))
145+
.add_step(steps::setup_sccache(Platform::Linux))
146146
.add_step(script_step)
147147
.add_step(steps::show_sccache_stats(Platform::Linux))
148148
.add_step(steps::cleanup_cargo_config(Platform::Linux))
@@ -157,9 +157,9 @@ fn unit_evals(commit: Option<&WorkflowInput>) -> Job {
157157
.add_step(steps::setup_cargo_config(Platform::Linux))
158158
.add_step(steps::cache_rust_dependencies_namespace())
159159
.map(steps::install_linux_dependencies)
160-
.add_step(steps::setup_sccache(Platform::Linux))
161160
.add_step(steps::cargo_install_nextest())
162161
.add_step(steps::clear_target_dir_if_large(Platform::Linux))
162+
.add_step(steps::setup_sccache(Platform::Linux))
163163
.add_step(match commit {
164164
Some(commit) => script_step.add_env(("UNIT_EVAL_COMMIT", commit)),
165165
None => script_step,

‎tooling/xtask/src/tasks/workflows/run_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,13 +421,13 @@ fn run_platform_tests_impl(platform: Platform, filter_packages: bool) -> NamedJo
421421
platform == Platform::Linux,
422422
steps::install_linux_dependencies,
423423
)
424-
.add_step(steps::setup_sccache(platform))
425424
.add_step(steps::setup_node())
426425
.when(
427426
platform == Platform::Linux || platform == Platform::Mac,
428427
|job| job.add_step(steps::cargo_install_nextest()),
429428
)
430429
.add_step(steps::clear_target_dir_if_large(platform))
430+
.add_step(steps::setup_sccache(platform))
431431
.when(filter_packages, |job| {
432432
job.add_step(
433433
steps::cargo_nextest(platform).with_changed_packages_filter("orchestrate"),

0 commit comments

Comments
 (0)