Skip to content

Commit 2c34a58

Browse files
Override wasm32 release channel to nightly
This should fix running tests on the emscripten target. In the future it's expected we'll want to entirely remove this builder since it's a tier 2 target, but for this initially beta-targeted patch keeping the changes minimal is preferred.
1 parent 9b40b3b commit 2c34a58

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,9 @@ jobs:
265265
os: ubuntu-20.04-8core-32gb
266266
env: {}
267267
- name: wasm32
268+
env:
269+
RUST_CI_OVERRIDE_RELEASE_CHANNEL: nightly
268270
os: ubuntu-20.04-8core-32gb
269-
env: {}
270271
- name: x86_64-gnu
271272
os: ubuntu-20.04-4core-16gb
272273
env: {}

src/ci/github-actions/ci.yml

+11
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,17 @@ jobs:
428428
<<: *job-linux-8c
429429

430430
- name: wasm32
431+
env:
432+
# Running emscripten tests currently requires that we are
433+
# building a nightly toolchain. Otherwise, we cannot pass
434+
# -Zunstable-options to libtest. Normally we workaround this by
435+
# setting RUSTC_BOOTSTRAP in the environment, but that doesn't
436+
# work for emscripten as environment variables are not threaded
437+
# into the compiled code.
438+
#
439+
# For more details see:
440+
# https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html#environment-variables
441+
RUST_CI_OVERRIDE_RELEASE_CHANNEL: nightly
431442
<<: *job-linux-8c
432443

433444
- name: x86_64-gnu

0 commit comments

Comments
 (0)