Skip to content

Commit 00b3707

Browse files
committed
ci(workflows): configure nightly toolchain env for nightly jobs
1 parent 5c602e6 commit 00b3707

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ jobs:
247247
runs-on: platform-runner
248248
if: github.event_name == 'workflow_dispatch' && github.event.inputs.run_nightly == 'true'
249249
env:
250+
RUSTUP_TOOLCHAIN: nightly
251+
PLATFORM_RUST_NIGHTLY: "1"
250252
PLATFORM_NIGHTLY_RUSTFLAGS: "-Z threads=0"
251253
PLATFORM_FAST_LINKER_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
252254
steps:
@@ -258,21 +260,26 @@ jobs:
258260
with:
259261
tool: cargo-nextest
260262
- name: Verify nightly config (nightly dry-run)
261-
run: PLATFORM_RUST_NIGHTLY=1 scripts/verify-nightly-config.sh
263+
run: scripts/verify-nightly-config.sh
262264
- uses: Swatinem/rust-cache@v2
263265
with:
264266
shared-key: "platform-ci-nightly"
265267
save-if: false
266268
- name: Nightly build
267-
run: PLATFORM_RUST_NIGHTLY=1 cargo build --release
269+
run: cargo build --release
268270
- name: Nightly tests
269-
run: PLATFORM_RUST_NIGHTLY=1 cargo nextest run --workspace -E 'not (test(/live/) | test(/integration/) | test(/e2e/))'
271+
run: cargo nextest run --workspace -E 'not (test(/live/) | test(/integration/) | test(/e2e/))'
270272

271273
docker-nightly:
272274
name: Docker Nightly Build
273275
runs-on: platform-runner
274276
if: github.event_name == 'workflow_dispatch' && github.event.inputs.run_nightly == 'true'
275277
needs: [nightly]
278+
env:
279+
RUSTUP_TOOLCHAIN: nightly
280+
PLATFORM_RUST_NIGHTLY: "1"
281+
PLATFORM_NIGHTLY_RUSTFLAGS: "-Z threads=0"
282+
PLATFORM_FAST_LINKER_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
276283
steps:
277284
- uses: actions/checkout@v4
278285
- name: Ensure Docker available
@@ -284,11 +291,10 @@ jobs:
284291
push: false
285292
build-args: |
286293
RUSTUP_TOOLCHAIN=nightly
287-
INSTALL_FAST_LINKER=mold
288294
PLATFORM_NIGHTLY_RUSTFLAGS=-Z threads=0
289295
PLATFORM_FAST_LINKER_RUSTFLAGS=-C link-arg=-fuse-ld=mold
290296
cache-from: type=gha
291297
- name: Nightly build
292-
run: PLATFORM_RUST_NIGHTLY=1 cargo build --release
298+
run: cargo build --release
293299
- name: Nightly tests
294-
run: PLATFORM_RUST_NIGHTLY=1 cargo nextest run --workspace -E 'not (test(/live/) | test(/integration/) | test(/e2e/))'
300+
run: cargo nextest run --workspace -E 'not (test(/live/) | test(/integration/) | test(/e2e/))'

0 commit comments

Comments
 (0)