Skip to content

Commit 6fbeb50

Browse files
committed
Pin emscripten test to older nightly too
1 parent 6678f7a commit 6fbeb50

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/build-test.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,9 @@ jobs:
229229
- name: Load nightly Rust toolchain for WASM.
230230
run: |
231231
rustup install nightly-2021-02-28
232-
rustup install nightly
233-
rustup target add wasm32-unknown-unknown --toolchain nightly-2021-02-28-x86_64-unknown-linux-gnu
234-
# emscripten test runs on newer nightly
235-
rustup target add wasm32-unknown-emscripten --toolchain nightly
236-
rustup component add rust-src --toolchain nightly
232+
rustup target add wasm32-unknown-unknown --toolchain nightly-2021-02-28
233+
rustup target add wasm32-unknown-emscripten --toolchain nightly-2021-02-28
234+
rustup component add rust-src --toolchain nightly-2021-02-28
237235
- name: Install WASM tools
238236
run: |
239237
sudo apt-get install wabt binaryen

ffi/cpp/examples/fixeddecimal_wasm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ a.out: ../../../../target/debug/libicu_capi.a $(ALL_HEADERS) test.cpp
1919
g++ -std=c++17 test.cpp ../../../../target/debug/libicu_capi.a -ldl -lpthread -lm -g
2020

2121
../../../../target/wasm32-unknown-emscripten/release/libicu_capi.a: $(ALL_RUST)
22-
RUSTFLAGS="-Cpanic=abort" cargo +nightly build --release -p icu_capi --target wasm32-unknown-emscripten -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort
22+
RUSTFLAGS="-Cpanic=abort" cargo +nightly-2021-02-28 build --release -p icu_capi --target wasm32-unknown-emscripten -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort
2323

2424
web-version.html: ../../../../target/wasm32-unknown-emscripten/release/libicu_capi.a $(ALL_HEADERS) test.cpp
2525
emcc -std=c++17 test.cpp ../../../../target/wasm32-unknown-emscripten/release/libicu_capi.a -ldl -lpthread -lm -g -o web-version.html --bind --emrun -sENVIRONMENT=web -sWASM=1 -sEXPORT_ES6=1 -sMODULARIZE=1

0 commit comments

Comments
 (0)