Skip to content

Commit

Permalink
Merge pull request #1224 from CosmWasm/wasmer-2.2
Browse files Browse the repository at this point in the history
Upgrade Wasmer to 2.2 (oh yeah, CosmWasm on ARM is coming 🐎)
  • Loading branch information
webmaster128 committed Mar 1, 2022
2 parents c92d87a + 0f37cc9 commit ec8b568
Show file tree
Hide file tree
Showing 17 changed files with 687 additions and 286 deletions.
63 changes: 63 additions & 0 deletions .circleci/config.yml
Expand Up @@ -7,6 +7,7 @@ workflows:
test:
# Keep those job names in sync with .mergify.yml
jobs:
- arm64
- package_crypto
- package_schema
- package_std
Expand Down Expand Up @@ -60,6 +61,68 @@ workflows:
ignore: /.*/

jobs:
arm64:
machine:
image: ubuntu-2004:202101-01
resource_class: arm.large
steps:
- checkout
- run:
name: Install Rust
command: |
wget https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init
chmod +x rustup-init
./rustup-init -y --default-toolchain 1.54.0 --profile minimal
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-arm64-rust:1.54.0-{{ checksum "Cargo.lock" }}
- run:
name: "contracts/crypto-verify: integration-test"
working_directory: ~/project/contracts/crypto-verify
command: cargo wasm --locked && cargo integration-test --locked
- run:
name: "contracts/hackatom: integration-test"
working_directory: ~/project/contracts/hackatom
command: cargo wasm --locked && cargo integration-test --locked
- run:
name: "contracts/queue: integration-test"
working_directory: ~/project/contracts/queue
command: cargo wasm --locked && cargo integration-test --locked
- run:
name: "contracts/reflect: integration-test"
working_directory: ~/project/contracts/reflect
command: cargo wasm --locked && cargo integration-test --locked
- run:
name: "contracts/staking: integration-test"
working_directory: ~/project/contracts/staking
command: cargo wasm --locked && cargo integration-test --locked
- run:
name: "packages/crypto: test"
working_directory: ~/project/packages/crypto
command: cargo test --locked
- run:
name: "packages/std: test"
working_directory: ~/project/packages/std
command: cargo test --locked
- run:
name: "packages/vm: test"
working_directory: ~/project/packages/vm
# use all features
command: cargo test --locked --features iterator,staking,stargate
- save_cache:
paths:
- ~/.cargo/registry
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-arm64-rust:1.54.0-{{ checksum "Cargo.lock" }}

package_crypto:
docker:
- image: rust:1.54.0
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,7 +12,10 @@ and this project adheres to
`SubMsgResult`. Both types are equal when serialized but `ContractResult` is
documented to be the result of a contract execution, which is not the case
here. ([#1232])
- cosmwasm-vm: Upgrade Wasmer to 2.2.0 and bump `MODULE_SERIALIZATION_VERSION`
to "v3-wasmer1". ([#1224])

[#1224]: https://github.com/CosmWasm/cosmwasm/pull/1224
[#1232]: https://github.com/CosmWasm/cosmwasm/pull/1232

## [1.0.0-beta5] - 2022-02-08
Expand Down
94 changes: 64 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ec8b568

Please sign in to comment.