Skip to content
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.

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

Test some build updates #658

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
VERSION = v23.07
VERSION = v23.09
IMAGE ?= veracruz
CONTAINER ?= veracruz
VERACRUZ_ROOT ?= ..
USER ?= $(shell id -un)
UID ?= $(shell id -u)
OS_NAME := $(shell uname -s | tr A-Z a-z)
ARCH = $(shell uname -m)
AWS_NITRO_CLI_REVISION = v1.2.1
AWS_NITRO_CLI_REVISION = v1.2.2

ifeq ($(OS_NAME),darwin)
LOCALIP = $(shell "(ifconfig en0 ; ifconfig en1) | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}'")
Expand Down
8 changes: 4 additions & 4 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ RUN apt-get update && \
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.66.0
RUST_VERSION=1.70.0

RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
esac; \
url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \
url="https://static.rust-lang.org/rustup/archive/1.26.0/${rustArch}/rustup-init"; \
wget "$url"; \
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
chmod +x rustup-init; \
Expand Down
4 changes: 3 additions & 1 deletion docker/ci/Dockerfile.cache
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ ARG VERSION="latest"
FROM veracruz/ci-base:${VERSION} as final

ARG ARCH=x86_64
ARG WASM_RUST_VERSION=1.66.1

RUN rustup target add ${ARCH}-unknown-linux-musl wasm32-wasi && \
RUN rustup target add ${ARCH}-unknown-linux-musl && \
rustup toolchain install ${WASM_RUST_VERSION} --target wasm32-wasi && \
cargo install empty-library || true # Load crates.io index

WORKDIR /work
4 changes: 3 additions & 1 deletion docker/ci/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ ARG VERSION="latest"
FROM veracruz/ci-base:${VERSION} as final

ARG ARCH=x86_64
ARG WASM_RUST_VERSION=1.66.1

RUN rustup target add ${ARCH}-unknown-linux-musl wasm32-wasi && \
RUN rustup target add ${ARCH}-unknown-linux-musl && \
rustup toolchain install ${WASM_RUST_VERSION} --target wasm32-wasi && \
rustup component add rustfmt

WORKDIR /work
6 changes: 3 additions & 3 deletions docs/CLI_QUICKSTART.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ Veracruz supports the direct execution of non-WebAssembly native code via the
compile the example to WebAssembly, which Rust makes very easy for us:

``` bash
$ cargo build \
--manifest-path=workspaces/applications/Cargo.toml \
$ (cd workspaces/applications ; \
cargo build \
--target wasm32-wasi \
--release \
--package shamir-secret-sharing
--package shamir-secret-sharing)
```

You should now find the example compiled to WebAssembly in the `target/wasm32-wasi/release`
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

3 changes: 3 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.70.0"
components = [ "rustfmt" ]
2 changes: 1 addition & 1 deletion workspaces/applications/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.66.0"
channel = "1.66.1"
components = [ "rustfmt" ]
targets = [ "wasm32-wasi" ]