From b4a616fc9e16f04a746e4e52f4890539cfc49709 Mon Sep 17 00:00:00 2001 From: Daniel Jacobs Date: Wed, 8 Jan 2025 18:00:26 -0500 Subject: [PATCH] web: Add rust-src component to CI for web tests, nightly, and Docker --- .github/workflows/release_nightly.yml | 1 + .github/workflows/test_extension_dockerfile.yml | 1 + .github/workflows/test_web.yml | 2 ++ web/docker/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index df3fbba9ef9c..07547e351fdc 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -336,6 +336,7 @@ jobs: with: toolchain: 1.81.0 targets: wasm32-unknown-unknown + components: rust-src - name: Setup Node.js uses: actions/setup-node@v4 diff --git a/.github/workflows/test_extension_dockerfile.yml b/.github/workflows/test_extension_dockerfile.yml index 27acaa7c89e7..f15d5ee104f7 100644 --- a/.github/workflows/test_extension_dockerfile.yml +++ b/.github/workflows/test_extension_dockerfile.yml @@ -21,6 +21,7 @@ jobs: with: toolchain: stable targets: wasm32-unknown-unknown + components: rust-src - name: Setup Node.js uses: actions/setup-node@v4 diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml index 83c51c795424..29ce7cc0e152 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -52,6 +52,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown + components: rust-src - name: Cache Cargo output uses: Swatinem/rust-cache@v2 @@ -117,6 +118,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown + components: rust-src - name: Cache Cargo output uses: Swatinem/rust-cache@v2 diff --git a/web/docker/Dockerfile b/web/docker/Dockerfile index 1f2797972708..1e426fcfbc53 100644 --- a/web/docker/Dockerfile +++ b/web/docker/Dockerfile @@ -11,7 +11,7 @@ RUN wget --progress=:giga https://github.com/WebAssembly/binaryen/releases/downl mv wasm-opt /usr/local/bin # Installing Rust using rustup: -RUN wget 'https://sh.rustup.rs' --quiet -O- | sh -s -- -y --profile minimal --target wasm32-unknown-unknown +RUN wget 'https://sh.rustup.rs' --quiet -O- | sh -s -- -y --profile minimal --target wasm32-unknown-unknown && rustup component add rust-src ENV PATH="/root/.cargo/bin:$PATH" # wasm-bindgen-cli version must match wasm-bindgen crate version. # Be sure to update in test_web.yml, release_nightly.yml, Cargo.toml, and web/README.md as well.