From 9b9abd0a086bb5a1af347c20a22780d44bf53b18 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Thu, 15 Jun 2023 22:48:39 -0400 Subject: [PATCH 01/15] chore: change rust vm docker image install order --- .../build-strategies/wasm/rust/vm/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 5c04849272..6175502266 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -11,8 +11,8 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install wasm-opt -RUN cargo install wasm-opt +# Install cargo-build-deps +RUN cargo install cargo-build-deps # Install the toml-cli RUN cargo install toml-cli @@ -20,14 +20,14 @@ RUN cargo install toml-cli # Install wasm-snip RUN cargo install wasm-snip -# Install wasm-bindgen -RUN cargo install wasm-bindgen-cli - # Install wasm-tools RUN cargo install wasm-tools -# Install cargo-build-deps -RUN cargo install cargo-build-deps +# Install wasm-bindgen +RUN cargo install wasm-bindgen-cli + +# Install wasm-opt +RUN cargo install wasm-opt # Ensure the Wasm module is configured to use imported memory ENV RUSTFLAGS="-C link-arg=-z -C link-arg=stack-size=65536 -C link-arg=--import-memory" From 34211c6eda79ffa639f6e99837bfde8508a67fd9 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Thu, 15 Jun 2023 22:58:05 -0400 Subject: [PATCH 02/15] feat: add ci-containers workflow --- .github/workflows/cd-containers.yaml | 2 +- .github/workflows/ci-containers.yaml | 34 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/ci-containers.yaml diff --git a/.github/workflows/cd-containers.yaml b/.github/workflows/cd-containers.yaml index 79a347fffb..3479718c6c 100644 --- a/.github/workflows/cd-containers.yaml +++ b/.github/workflows/cd-containers.yaml @@ -11,7 +11,7 @@ jobs: github.event.pull_request.merged && endsWith(github.event.pull_request.title, '/workflows/cd-containers') && github.event.pull_request.user.login != 'polywrap-build-bot' - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml new file mode 100644 index 0000000000..e8777151a7 --- /dev/null +++ b/.github/workflows/ci-containers.yaml @@ -0,0 +1,34 @@ +name: CI-Containers + +on: + pull_request: + paths: + - "packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile" + - "packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm/Dockerfile" + +jobs: + Build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.base.ref }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Cache Image Directories + run: | + echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV + echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV + + - name: Build RS VM Image + working-directory: ${{env.IMAGE_RS_VM_DIR}} + run: | + docker buildx build . --platform=linux/amd64,linux/arm64 + + - name: Build AS VM Image + working-directory: ${{env.IMAGE_AS_VM_DIR}} + run: | + docker buildx build . --platform=linux/amd64,linux/arm64 From 3aa6f3a6909ba9f9d62d6298dd49c9d466fb22b2 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 00:34:03 -0400 Subject: [PATCH 03/15] chore: remove cargo-build-deps from rust vm --- .../src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 6175502266..f21bb84c20 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -11,9 +11,6 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install cargo-build-deps -RUN cargo install cargo-build-deps - # Install the toml-cli RUN cargo install toml-cli From 0af817d68fbe2f59dc6aabc2e35757aef1e1139a Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 01:04:54 -0400 Subject: [PATCH 04/15] feat: upgrade rust version to 1.70 in build images --- .../wasm/rust/image/Dockerfile.mustache | 12 ++++++------ .../build-strategies/wasm/rust/vm/Dockerfile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache index df8f59ba41..d2de2f045f 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache @@ -1,4 +1,4 @@ -FROM rust:1.66-alpine as base +FROM rust:1.70-alpine as base # Install the wasm32 rust build target RUN rustup target add wasm32-unknown-unknown @@ -11,20 +11,20 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install wasm-opt -RUN cargo install wasm-opt - # Install the toml-cli RUN cargo install toml-cli # Install wasm-snip RUN cargo install wasm-snip +# Install wasm-tools +RUN cargo install wasm-tools + # Install wasm-bindgen RUN cargo install wasm-bindgen-cli -# Install wasm-tools -RUN cargo install wasm-tools +# Install wasm-opt +RUN cargo install wasm-opt # Install cargo-build-deps RUN cargo install cargo-build-deps diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index f21bb84c20..3b87947f4d 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.66-alpine as base +FROM rust:1.70-alpine as base # Install the wasm32 rust build target RUN rustup target add wasm32-unknown-unknown From f0e3369bf8425c7b197a21d498d8c5b420401fce Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 01:22:55 -0400 Subject: [PATCH 05/15] testing: separate platform targets --- .github/workflows/ci-containers.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml index e8777151a7..09db568aca 100644 --- a/.github/workflows/ci-containers.yaml +++ b/.github/workflows/ci-containers.yaml @@ -23,12 +23,22 @@ jobs: echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV - - name: Build RS VM Image + - name: Build RS VM Image (linux/amd64) working-directory: ${{env.IMAGE_RS_VM_DIR}} run: | - docker buildx build . --platform=linux/amd64,linux/arm64 + docker buildx build . --platform=linux/amd64 - - name: Build AS VM Image + - name: Build RS VM Image (linux/arm64) + working-directory: ${{env.IMAGE_RS_VM_DIR}} + run: | + docker buildx build . --platform=linux/arm64 + + - name: Build AS VM Image (linux/amd64) + working-directory: ${{env.IMAGE_AS_VM_DIR}} + run: | + docker buildx build . --platform=linux/amd64 + + - name: Build AS VM Image (linux/arm64) working-directory: ${{env.IMAGE_AS_VM_DIR}} run: | - docker buildx build . --platform=linux/amd64,linux/arm64 + docker buildx build . --platform=linux/arm64 From 687d63c07b1e3f2deed5984554fcffd21932354a Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 11:43:55 -0400 Subject: [PATCH 06/15] chore: remove wasm-opt from arm build --- .github/workflows/ci-containers.yaml | 8 ++++---- .../lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml index 09db568aca..81fe7d5087 100644 --- a/.github/workflows/ci-containers.yaml +++ b/.github/workflows/ci-containers.yaml @@ -23,10 +23,10 @@ jobs: echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV - - name: Build RS VM Image (linux/amd64) - working-directory: ${{env.IMAGE_RS_VM_DIR}} - run: | - docker buildx build . --platform=linux/amd64 + # - name: Build RS VM Image (linux/amd64) + # working-directory: ${{env.IMAGE_RS_VM_DIR}} + # run: | + # docker buildx build . --platform=linux/amd64 - name: Build RS VM Image (linux/arm64) working-directory: ${{env.IMAGE_RS_VM_DIR}} diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 3b87947f4d..a1772037aa 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -24,7 +24,7 @@ RUN cargo install wasm-tools RUN cargo install wasm-bindgen-cli # Install wasm-opt -RUN cargo install wasm-opt +# RUN cargo install wasm-opt # Ensure the Wasm module is configured to use imported memory ENV RUSTFLAGS="-C link-arg=-z -C link-arg=stack-size=65536 -C link-arg=--import-memory" From cfc0133ea5976effc812dea45c4d9ce3efbb946e Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 11:49:36 -0400 Subject: [PATCH 07/15] chore: no cache --- .github/workflows/ci-containers.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml index 81fe7d5087..4be8d258a2 100644 --- a/.github/workflows/ci-containers.yaml +++ b/.github/workflows/ci-containers.yaml @@ -26,19 +26,19 @@ jobs: # - name: Build RS VM Image (linux/amd64) # working-directory: ${{env.IMAGE_RS_VM_DIR}} # run: | - # docker buildx build . --platform=linux/amd64 + # docker buildx build . --platform=linux/amd64 --no-cache - name: Build RS VM Image (linux/arm64) working-directory: ${{env.IMAGE_RS_VM_DIR}} run: | - docker buildx build . --platform=linux/arm64 + docker buildx build . --platform=linux/arm64 --no-cache - name: Build AS VM Image (linux/amd64) working-directory: ${{env.IMAGE_AS_VM_DIR}} run: | - docker buildx build . --platform=linux/amd64 + docker buildx build . --platform=linux/amd64 --no-cache - name: Build AS VM Image (linux/arm64) working-directory: ${{env.IMAGE_AS_VM_DIR}} run: | - docker buildx build . --platform=linux/arm64 + docker buildx build . --platform=linux/arm64 --no-cache From 005d95151233ebd52063aadbdba5d1dcdc1116af Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 11:56:50 -0400 Subject: [PATCH 08/15] chore: checkout the right branch -.- --- .github/workflows/ci-containers.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml index 4be8d258a2..719e92be1a 100644 --- a/.github/workflows/ci-containers.yaml +++ b/.github/workflows/ci-containers.yaml @@ -10,10 +10,8 @@ jobs: Build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.base.ref }} + - name: Checkout repository + uses: actions/checkout@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 13b651a31544d02f9ff1190b8c9a959c6f6fbf44 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 11:59:49 -0400 Subject: [PATCH 09/15] chore: add back wasm-opt --- .../src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index a1772037aa..3b87947f4d 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -24,7 +24,7 @@ RUN cargo install wasm-tools RUN cargo install wasm-bindgen-cli # Install wasm-opt -# RUN cargo install wasm-opt +RUN cargo install wasm-opt # Ensure the Wasm module is configured to use imported memory ENV RUSTFLAGS="-C link-arg=-z -C link-arg=stack-size=65536 -C link-arg=--import-memory" From 49a947211278fbac0ae3038dd21bdfd379df538c Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 21:32:37 -0400 Subject: [PATCH 10/15] chore: update wasm-opt installation --- .../wasm/rust/image/Dockerfile.mustache | 10 ++++++---- .../defaults/build-strategies/wasm/rust/local/local.sh | 2 +- .../defaults/build-strategies/wasm/rust/vm/Dockerfile | 10 ++++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache index d2de2f045f..24f0216582 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache @@ -11,8 +11,10 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install the toml-cli -RUN cargo install toml-cli +# Install wasm-opt +RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash +RUN nvm install 18 && nvm use 18 +RUN npm i wasm-opt -g # Install wasm-snip RUN cargo install wasm-snip @@ -23,8 +25,8 @@ RUN cargo install wasm-tools # Install wasm-bindgen RUN cargo install wasm-bindgen-cli -# Install wasm-opt -RUN cargo install wasm-opt +# Install the toml-cli +RUN cargo install toml-cli # Install cargo-build-deps RUN cargo install cargo-build-deps diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh index 56037f4056..17833596aa 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh @@ -16,7 +16,7 @@ cargo install wasm-bindgen-cli cargo install wasm-tools # Install wasm-opt -cargo install wasm-opt +RUN npm i wasm-opt -g # Ensure the module at {{dir}} has the crate-type = ["cdylib"] toml set "$1"/Cargo.toml lib.crate-type ["cdylib"] > "$1"/Cargo-local.toml && \ diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 3b87947f4d..8df6c17860 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -11,8 +11,10 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install the toml-cli -RUN cargo install toml-cli +# Install wasm-opt +RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash +RUN nvm install 18 && nvm use 18 +RUN npm i wasm-opt -g # Install wasm-snip RUN cargo install wasm-snip @@ -23,8 +25,8 @@ RUN cargo install wasm-tools # Install wasm-bindgen RUN cargo install wasm-bindgen-cli -# Install wasm-opt -RUN cargo install wasm-opt +# Install the toml-cli +RUN cargo install toml-cli # Ensure the Wasm module is configured to use imported memory ENV RUSTFLAGS="-C link-arg=-z -C link-arg=stack-size=65536 -C link-arg=--import-memory" From b975f177b7c62319f91f0c7ccfcacd32f51533e7 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 21:35:56 -0400 Subject: [PATCH 11/15] chore: add .bashrc file --- .../src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 8df6c17860..ac9605d9ac 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -12,6 +12,7 @@ RUN apk add curl pkgconfig openssl-dev bash RUN apk add clang llvm build-base # Install wasm-opt +RUN touch ~/.bashrc RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash RUN nvm install 18 && nvm use 18 RUN npm i wasm-opt -g From 01386fd15d93cac7c605fa4126f622ca92d2cbad Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 21:38:11 -0400 Subject: [PATCH 12/15] chore: load bashrc --- .../src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index ac9605d9ac..c6cb6d0244 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -14,6 +14,7 @@ RUN apk add clang llvm build-base # Install wasm-opt RUN touch ~/.bashrc RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash +RUN source ~/.bashrc RUN nvm install 18 && nvm use 18 RUN npm i wasm-opt -g From 213778ac7321e283ab832d24041b47ecb83804e6 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 21:52:01 -0400 Subject: [PATCH 13/15] chore: update node & npm installation --- .../build-strategies/wasm/rust/image/Dockerfile.mustache | 5 +++-- .../lib/defaults/build-strategies/wasm/rust/vm/Dockerfile | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache index 24f0216582..c2f08d6b3a 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache @@ -11,9 +11,10 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base +# Install Node.js +RUN apk add --no-cache nodejs npm + # Install wasm-opt -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash -RUN nvm install 18 && nvm use 18 RUN npm i wasm-opt -g # Install wasm-snip diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index c6cb6d0244..779a77541a 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -11,11 +11,10 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base +# Install Node.js +RUN apk add --no-cache nodejs npm + # Install wasm-opt -RUN touch ~/.bashrc -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash -RUN source ~/.bashrc -RUN nvm install 18 && nvm use 18 RUN npm i wasm-opt -g # Install wasm-snip From 207628ebf9c6667a57661cb3107a46ca43247c75 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 22:02:19 -0400 Subject: [PATCH 14/15] chore: fix wasm-opt download --- .github/workflows/ci-containers.yaml | 18 ++++-------------- .../strategies/DockerVMStrategy.ts | 2 +- .../wasm/rust/image/Dockerfile.mustache | 8 ++++---- .../build-strategies/wasm/rust/local/local.sh | 3 --- .../build-strategies/wasm/rust/vm/Dockerfile | 8 ++++---- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci-containers.yaml b/.github/workflows/ci-containers.yaml index 719e92be1a..32369956a7 100644 --- a/.github/workflows/ci-containers.yaml +++ b/.github/workflows/ci-containers.yaml @@ -21,22 +21,12 @@ jobs: echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV - # - name: Build RS VM Image (linux/amd64) - # working-directory: ${{env.IMAGE_RS_VM_DIR}} - # run: | - # docker buildx build . --platform=linux/amd64 --no-cache - - - name: Build RS VM Image (linux/arm64) + - name: Build RS VM Image working-directory: ${{env.IMAGE_RS_VM_DIR}} run: | - docker buildx build . --platform=linux/arm64 --no-cache - - - name: Build AS VM Image (linux/amd64) - working-directory: ${{env.IMAGE_AS_VM_DIR}} - run: | - docker buildx build . --platform=linux/amd64 --no-cache + docker buildx build . --platform=linux/amd64,linux/arm64 - - name: Build AS VM Image (linux/arm64) + - name: Build AS VM Image working-directory: ${{env.IMAGE_AS_VM_DIR}} run: | - docker buildx build . --platform=linux/arm64 --no-cache + docker buildx build . --platform=linux/amd64,linux/arm64 diff --git a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts index 35133ab8db..1cac9c1e9f 100644 --- a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts +++ b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts @@ -36,7 +36,7 @@ const CONFIGS: Record = { "wasm/rust": { defaultIncludes: ["Cargo.toml", "Cargo.lock"], baseImage: "polywrap/vm-base-rs", - version: "0.2.1", + version: "0.2.0", }, "wasm/assemblyscript": { defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"], diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache index c2f08d6b3a..6174bc7054 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache @@ -11,11 +11,11 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install Node.js -RUN apk add --no-cache nodejs npm - # Install wasm-opt -RUN npm i wasm-opt -g +RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \ + && chmod +x binaryen-version_101/bin/wasm-opt \ + && cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \ + && rm -rf binary-version_101 # Install wasm-snip RUN cargo install wasm-snip diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh index 17833596aa..00385def23 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh @@ -15,9 +15,6 @@ cargo install wasm-bindgen-cli # Install wasm-tools cargo install wasm-tools -# Install wasm-opt -RUN npm i wasm-opt -g - # Ensure the module at {{dir}} has the crate-type = ["cdylib"] toml set "$1"/Cargo.toml lib.crate-type ["cdylib"] > "$1"/Cargo-local.toml && \ mv "$1"/Cargo.toml "$1"/Cargo-bak.toml && \ diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index 779a77541a..e692599a6c 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -11,11 +11,11 @@ RUN apk add curl pkgconfig openssl-dev bash # Install clang RUN apk add clang llvm build-base -# Install Node.js -RUN apk add --no-cache nodejs npm - # Install wasm-opt -RUN npm i wasm-opt -g +RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \ + && chmod +x binaryen-version_101/bin/wasm-opt \ + && cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \ + && rm -rf binary-version_101 # Install wasm-snip RUN cargo install wasm-snip From 0a6ff2bab770b7c0ca4c7851c4e605e0e42ad19e Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Fri, 16 Jun 2023 22:04:59 -0400 Subject: [PATCH 15/15] chore: set vm-rs version --- .../cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts index 1cac9c1e9f..35133ab8db 100644 --- a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts +++ b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts @@ -36,7 +36,7 @@ const CONFIGS: Record = { "wasm/rust": { defaultIncludes: ["Cargo.toml", "Cargo.lock"], baseImage: "polywrap/vm-base-rs", - version: "0.2.0", + version: "0.2.1", }, "wasm/assemblyscript": { defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"],