Skip to content

Commit 5ebb44e

Browse files
authored
Try using sccache instead of disabling (#7873)
We temporarily can't build sccache on windows runners, but it's still available on linux. this smol change lets us use it when available, instead of disabling across the board. The Windows runners now have a conditional check to disable (unset the `rustc-wrapper` env var) sccache in their entrypoint, just like the Linux ones have. Also the workflows no longer fail when `sccache --show-stats` fails.
1 parent ee1b0ae commit 5ebb44e

File tree

7 files changed

+44
-45
lines changed

7 files changed

+44
-45
lines changed

.cargo/config.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
[env]
22
# Set the number of arenas to 16 when using jemalloc.
33
JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16"
4-
5-
# FIXME: sccache temporarily disabled due to Windows issues
6-
[build]
7-
rustc-wrapper = ""

.github/workflows/book.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-and-upload-to-s3:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717

1818
- name: Setup mdBook
1919
uses: peaceiris/actions-mdbook@v1

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
VERSION: ${{ needs.extract-version.outputs.VERSION }}
6565
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
6666
steps:
67-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v5
6868
- name: Update Rust
6969
if: env.SELF_HOSTED_RUNNERS == 'false'
7070
run: rustup update stable

.github/workflows/linkcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424

2525
- name: Run mdbook server
2626
run: |

.github/workflows/local-testnet.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
dockerfile-ubuntu:
1717
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Build Docker image
2222
run: |
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-22.04
3535
needs: dockerfile-ubuntu
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838

3939
- name: Install Kurtosis
4040
run: |
@@ -102,7 +102,7 @@ jobs:
102102
needs: dockerfile-ubuntu
103103
runs-on: ubuntu-22.04
104104
steps:
105-
- uses: actions/checkout@v4
105+
- uses: actions/checkout@v5
106106

107107
- name: Install Kurtosis
108108
run: |
@@ -138,7 +138,7 @@ jobs:
138138
needs: dockerfile-ubuntu
139139
runs-on: ubuntu-22.04
140140
steps:
141-
- uses: actions/checkout@v4
141+
- uses: actions/checkout@v5
142142

143143
- name: Install Kurtosis
144144
run: |
@@ -181,7 +181,7 @@ jobs:
181181
matrix:
182182
network: [sepolia, devnet]
183183
steps:
184-
- uses: actions/checkout@v4
184+
- uses: actions/checkout@v5
185185

186186
- name: Install Kurtosis
187187
run: |
@@ -224,7 +224,7 @@ jobs:
224224
fork: [electra, fulu]
225225
offline_secs: [120, 300]
226226
steps:
227-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v5
228228

229229
- name: Install Kurtosis
230230
run: |
@@ -268,7 +268,7 @@ jobs:
268268
'doppelganger-protection-failure-test',
269269
]
270270
steps:
271-
- uses: actions/checkout@v4
271+
- uses: actions/checkout@v5
272272
- name: Check that success job is dependent on all others
273273
run: |
274274
exclude_jobs='checkpoint-sync-test|genesis-sync-test'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
needs: extract-version
5353
steps:
5454
- name: Checkout sources
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656
- name: Get latest version of stable Rust
5757
if: env.SELF_HOSTED_RUNNERS == 'false'
5858
run: rustup update stable
@@ -160,7 +160,7 @@ jobs:
160160
steps:
161161
# This is necessary for generating the changelog. It has to come before "Download Artifacts" or else it deletes the artifacts.
162162
- name: Checkout sources
163-
uses: actions/checkout@v4
163+
uses: actions/checkout@v5
164164
with:
165165
fetch-depth: 0
166166

.github/workflows/test-suite.yml

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ env:
2828
CARGO_INCREMENTAL: 0
2929
# Enable portable to prevent issues with caching `blst` for the wrong CPU type
3030
TEST_FEATURES: portable
31-
# FIXME: sccache disabled
32-
RUSTC_WRAPPER: ""
33-
SCCACHE_CACHE_SIZE: 0
3431
jobs:
3532
check-labels:
3633
runs-on: ubuntu-latest
@@ -84,7 +81,7 @@ jobs:
8481
# Use self-hosted runners only on the sigp repo.
8582
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
8683
steps:
87-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v5
8885
# Set Java version to 21. (required since Web3Signer 24.12.0).
8986
- uses: actions/setup-java@v4
9087
with:
@@ -107,15 +104,16 @@ jobs:
107104
- name: Run tests in release
108105
run: make nextest-release
109106
- name: Show cache stats
110-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
107+
if: env.SELF_HOSTED_RUNNERS == 'true'
108+
continue-on-error: true
111109
run: sccache --show-stats
112110
release-tests-windows:
113111
name: release-tests-windows
114112
needs: [check-labels]
115113
if: needs.check-labels.outputs.skip_ci != 'true'
116114
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "CI"]') || 'windows-2019' }}
117115
steps:
118-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v5
119117
- name: Get latest version of stable Rust
120118
if: env.SELF_HOSTED_RUNNERS == 'false'
121119
uses: moonrepo/setup-rust@v1
@@ -138,7 +136,8 @@ jobs:
138136
- name: Run tests in release
139137
run: make nextest-release
140138
- name: Show cache stats
141-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
139+
if: env.SELF_HOSTED_RUNNERS == 'true'
140+
continue-on-error: true
142141
run: sccache --show-stats
143142
beacon-chain-tests:
144143
name: beacon-chain-tests
@@ -149,7 +148,7 @@ jobs:
149148
env:
150149
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151150
steps:
152-
- uses: actions/checkout@v4
151+
- uses: actions/checkout@v5
153152
- name: Get latest version of stable Rust
154153
if: env.SELF_HOSTED_RUNNERS == 'false'
155154
uses: moonrepo/setup-rust@v1
@@ -160,7 +159,8 @@ jobs:
160159
- name: Run beacon_chain tests for all known forks
161160
run: make test-beacon-chain
162161
- name: Show cache stats
163-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
162+
if: env.SELF_HOSTED_RUNNERS == 'true'
163+
continue-on-error: true
164164
run: sccache --show-stats
165165
http-api-tests:
166166
name: http-api-tests
@@ -171,7 +171,7 @@ jobs:
171171
env:
172172
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
173173
steps:
174-
- uses: actions/checkout@v4
174+
- uses: actions/checkout@v5
175175
- name: Get latest version of stable Rust
176176
if: env.SELF_HOSTED_RUNNERS == 'false'
177177
uses: moonrepo/setup-rust@v1
@@ -182,7 +182,8 @@ jobs:
182182
- name: Run http_api tests for all recent forks
183183
run: make test-http-api
184184
- name: Show cache stats
185-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
185+
if: env.SELF_HOSTED_RUNNERS == 'true'
186+
continue-on-error: true
186187
run: sccache --show-stats
187188
op-pool-tests:
188189
name: op-pool-tests
@@ -192,7 +193,7 @@ jobs:
192193
env:
193194
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
194195
steps:
195-
- uses: actions/checkout@v4
196+
- uses: actions/checkout@v5
196197
- name: Get latest version of stable Rust
197198
uses: moonrepo/setup-rust@v1
198199
with:
@@ -209,7 +210,7 @@ jobs:
209210
env:
210211
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
211212
steps:
212-
- uses: actions/checkout@v4
213+
- uses: actions/checkout@v5
213214
- name: Get latest version of stable Rust
214215
uses: moonrepo/setup-rust@v1
215216
with:
@@ -237,7 +238,7 @@ jobs:
237238
env:
238239
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
239240
steps:
240-
- uses: actions/checkout@v4
241+
- uses: actions/checkout@v5
241242
- name: Get latest version of stable Rust
242243
uses: moonrepo/setup-rust@v1
243244
with:
@@ -255,7 +256,7 @@ jobs:
255256
env:
256257
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
257258
steps:
258-
- uses: actions/checkout@v4
259+
- uses: actions/checkout@v5
259260
- name: Get latest version of stable Rust
260261
if: env.SELF_HOSTED_RUNNERS == 'false'
261262
uses: moonrepo/setup-rust@v1
@@ -270,15 +271,16 @@ jobs:
270271
- name: Run tests in debug
271272
run: make nextest-debug
272273
- name: Show cache stats
273-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
274+
if: env.SELF_HOSTED_RUNNERS == 'true'
275+
continue-on-error: true
274276
run: sccache --show-stats
275277
state-transition-vectors-ubuntu:
276278
name: state-transition-vectors-ubuntu
277279
needs: [check-labels]
278280
if: needs.check-labels.outputs.skip_ci != 'true'
279281
runs-on: ubuntu-latest
280282
steps:
281-
- uses: actions/checkout@v4
283+
- uses: actions/checkout@v5
282284
- name: Get latest version of stable Rust
283285
uses: moonrepo/setup-rust@v1
284286
with:
@@ -295,7 +297,7 @@ jobs:
295297
env:
296298
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
297299
steps:
298-
- uses: actions/checkout@v4
300+
- uses: actions/checkout@v5
299301
- name: Get latest version of stable Rust
300302
if: env.SELF_HOSTED_RUNNERS == 'false'
301303
uses: moonrepo/setup-rust@v1
@@ -306,15 +308,16 @@ jobs:
306308
- name: Run consensus-spec-tests with blst and fake_crypto
307309
run: make nextest-ef
308310
- name: Show cache stats
309-
if: env.SELF_HOSTED_RUNNERS == 'true' && false
311+
if: env.SELF_HOSTED_RUNNERS == 'true'
312+
continue-on-error: true
310313
run: sccache --show-stats
311314
basic-simulator-ubuntu:
312315
name: basic-simulator-ubuntu
313316
needs: [check-labels]
314317
if: needs.check-labels.outputs.skip_ci != 'true'
315318
runs-on: ubuntu-latest
316319
steps:
317-
- uses: actions/checkout@v4
320+
- uses: actions/checkout@v5
318321
- name: Get latest version of stable Rust
319322
uses: moonrepo/setup-rust@v1
320323
with:
@@ -335,7 +338,7 @@ jobs:
335338
if: needs.check-labels.outputs.skip_ci != 'true'
336339
runs-on: ubuntu-latest
337340
steps:
338-
- uses: actions/checkout@v4
341+
- uses: actions/checkout@v5
339342
- name: Get latest version of stable Rust
340343
uses: moonrepo/setup-rust@v1
341344
with:
@@ -356,7 +359,7 @@ jobs:
356359
if: needs.check-labels.outputs.skip_ci != 'true'
357360
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest' }}
358361
steps:
359-
- uses: actions/checkout@v4
362+
- uses: actions/checkout@v5
360363
- name: Get latest version of stable Rust
361364
if: env.SELF_HOSTED_RUNNERS == 'false'
362365
uses: moonrepo/setup-rust@v1
@@ -377,7 +380,7 @@ jobs:
377380
env:
378381
CARGO_INCREMENTAL: 1
379382
steps:
380-
- uses: actions/checkout@v4
383+
- uses: actions/checkout@v5
381384
- name: Get latest version of stable Rust
382385
uses: moonrepo/setup-rust@v1
383386
with:
@@ -407,7 +410,7 @@ jobs:
407410
name: check-msrv
408411
runs-on: ubuntu-latest
409412
steps:
410-
- uses: actions/checkout@v4
413+
- uses: actions/checkout@v5
411414
- name: Install Rust at Minimum Supported Rust Version (MSRV)
412415
run: |
413416
metadata=$(cargo metadata --no-deps --format-version 1)
@@ -421,7 +424,7 @@ jobs:
421424
if: needs.check-labels.outputs.skip_ci != 'true'
422425
runs-on: ubuntu-latest
423426
steps:
424-
- uses: actions/checkout@v4
427+
- uses: actions/checkout@v5
425428
- name: Get latest version of nightly Rust
426429
uses: moonrepo/setup-rust@v1
427430
with:
@@ -449,7 +452,7 @@ jobs:
449452
if: needs.check-labels.outputs.skip_ci != 'true'
450453
runs-on: ubuntu-latest
451454
steps:
452-
- uses: actions/checkout@v4
455+
- uses: actions/checkout@v5
453456
- name: Install dependencies
454457
run: sudo apt update && sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang
455458
- name: Use Rust beta
@@ -462,7 +465,7 @@ jobs:
462465
if: needs.check-labels.outputs.skip_ci != 'true'
463466
runs-on: ubuntu-latest
464467
steps:
465-
- uses: actions/checkout@v4
468+
- uses: actions/checkout@v5
466469
- name: Get latest version of stable Rust
467470
uses: moonrepo/setup-rust@v1
468471
with:
@@ -476,7 +479,7 @@ jobs:
476479
if: needs.check-labels.outputs.skip_ci != 'true'
477480
runs-on: ubuntu-latest
478481
steps:
479-
- uses: actions/checkout@v4
482+
- uses: actions/checkout@v5
480483
- name: Get latest version of stable Rust
481484
uses: moonrepo/setup-rust@v1
482485
with:
@@ -516,6 +519,6 @@ jobs:
516519
'cargo-sort',
517520
]
518521
steps:
519-
- uses: actions/checkout@v4
522+
- uses: actions/checkout@v5
520523
- name: Check that success job is dependent on all others
521524
run: ./scripts/ci/check-success-job.sh ./.github/workflows/test-suite.yml test-suite-success

0 commit comments

Comments
 (0)