Skip to content

fix: cd-containers build | /workflows/cd-containers #1779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dOrgJelli merged 15 commits into from
Jun 17, 2023
Merged

fix: cd-containers build | /workflows/cd-containers #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9b9abd0
chore: change rust vm docker image install order
dOrgJelli Jun 16, 2023
34211c6
feat: add ci-containers workflow
dOrgJelli Jun 16, 2023
3aa6f3a
chore: remove cargo-build-deps from rust vm
dOrgJelli Jun 16, 2023
0af817d
feat: upgrade rust version to 1.70 in build images
dOrgJelli Jun 16, 2023
f0e3369
testing: separate platform targets
dOrgJelli Jun 16, 2023
687d63c
chore: remove wasm-opt from arm build
dOrgJelli Jun 16, 2023
cfc0133
chore: no cache
dOrgJelli Jun 16, 2023
005d951
chore: checkout the right branch -.-
dOrgJelli Jun 16, 2023
13b651a
chore: add back wasm-opt
dOrgJelli Jun 16, 2023
49a9472
chore: update wasm-opt installation
dOrgJelli Jun 17, 2023
b975f17
chore: add .bashrc file
dOrgJelli Jun 17, 2023
01386fd
chore: load bashrc
dOrgJelli Jun 17, 2023
213778a
chore: update node & npm installation
dOrgJelli Jun 17, 2023
207628e
chore: fix wasm-opt download
dOrgJelli Jun 17, 2023
0a6ff2b
chore: set vm-rs version
dOrgJelli Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd-containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/ci-containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
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 repository
uses: actions/checkout@v2

- 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
17 changes: 10 additions & 7 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,19 +12,22 @@ RUN apk add curl pkgconfig openssl-dev bash
RUN apk add clang llvm build-base

# Install wasm-opt
RUN cargo install wasm-opt

# Install the toml-cli
RUN cargo install toml-cli
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

# 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 the toml-cli
RUN cargo install toml-cli

# Install cargo-build-deps
RUN cargo install cargo-build-deps
Expand Down
3 changes: 0 additions & 3 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ cargo install wasm-bindgen-cli
# Install wasm-tools
cargo install wasm-tools

# Install wasm-opt
cargo install wasm-opt

# 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 && \
Expand Down
20 changes: 10 additions & 10 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,22 +12,22 @@ RUN apk add curl pkgconfig openssl-dev bash
RUN apk add clang llvm build-base

# Install wasm-opt
RUN cargo install wasm-opt

# Install the toml-cli
RUN cargo install toml-cli
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

# 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 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"
Expand Down