From 175b1ba85488d0dcbb74d105e7bd33c838565651 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Thu, 26 Dec 2024 18:24:56 +0300 Subject: [PATCH 1/2] unlock wasm-pack version Signed-off-by: onur-ozkan --- .docker/Dockerfile | 3 ++- .github/workflows/dev-build.yml | 3 ++- .github/workflows/release-build.yml | 3 ++- docs/WASM_BUILD.md | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 677d5f8152..2ac005c21c 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -51,7 +51,8 @@ RUN apt-get install -y \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain nightly-2023-06-01 -y ENV PATH="/root/.cargo/bin:$PATH" -RUN cargo install wasm-pack --version 0.10.3 +# TODO: Lock wasm-pack version +RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip RUN unzip protoc-25.3-linux-x86_64.zip && mv ./include/google /usr/include/google diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index ccc959509d..8877bb518f 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -368,7 +368,8 @@ jobs: rustup target add wasm32-unknown-unknown - name: Install wasm-pack - run: CARGO_HOME=/root/.cargo cargo install wasm-pack --version 0.10.3 + # TODO: Lock wasm-pack version + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Calculate commit hash for PR commit if: github.event_name == 'pull_request' diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 9cf66098bb..cae080b3d9 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -334,7 +334,8 @@ jobs: rustup target add wasm32-unknown-unknown - name: Install wasm-pack - run: CARGO_HOME=/root/.cargo cargo install wasm-pack --version 0.10.3 + # TODO: Lock wasm-pack version + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Calculate commit hash for PR commit if: github.event_name == 'pull_request' diff --git a/docs/WASM_BUILD.md b/docs/WASM_BUILD.md index 718b8d5bd1..28355bbf80 100644 --- a/docs/WASM_BUILD.md +++ b/docs/WASM_BUILD.md @@ -21,7 +21,7 @@ To build WASM binary from source, the following prerequisites are required: 1. Install `wasm-pack` ``` - cargo install wasm-pack + curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh ``` 2. OSX specific: install `llvm` ``` From 9b9582f12affb3c810c53ebc658ec5e8cd4d91db Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Thu, 26 Dec 2024 18:31:27 +0300 Subject: [PATCH 2/2] force yes on docker build Signed-off-by: onur-ozkan --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 2ac005c21c..467dc4ebc4 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -52,7 +52,7 @@ RUN apt-get install -y \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain nightly-2023-06-01 -y ENV PATH="/root/.cargo/bin:$PATH" # TODO: Lock wasm-pack version -RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh +RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | bash -s -- -y RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip RUN unzip protoc-25.3-linux-x86_64.zip && mv ./include/google /usr/include/google