Skip to content

Commit

Permalink
Merge pull request #48 from axvn/upgrade-rustc
Browse files Browse the repository at this point in the history
Upgrade rustc to fix the wasm-build
  • Loading branch information
the-frey authored Jan 28, 2022
2 parents d1a3631 + f744d78 commit dab3e6c
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ workflows:
jobs:
contract_cw721_base:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
working_directory: ~/project/contracts/cw721-base
steps:
- checkout:
Expand All @@ -31,7 +31,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -53,12 +53,12 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}


contract_cw721_metadata_onchain:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
working_directory: ~/project/contracts/cw721-metadata-onchain
steps:
- checkout:
Expand All @@ -68,7 +68,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-metadata-onchain-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -90,12 +90,12 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-metadata-onchain-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}


contract_cw721_fixed_price:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
working_directory: ~/project/contracts/cw721-fixed-price
steps:
- checkout:
Expand All @@ -105,7 +105,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-fixed-price-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -127,12 +127,12 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-fixed-price-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}


package_cw721:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
working_directory: ~/project/packages/cw721
steps:
- checkout:
Expand All @@ -142,7 +142,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw721:1.53.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -165,19 +165,19 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw721:1.53.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }}

lint:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-lint-rust:1.53.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -196,15 +196,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.53.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }}

# This runs one time on the top level to ensure all contracts compile properly into wasm.
# We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
# for all the other tests.
# We also sanity-check the resultant wasm files.
wasm-build:
docker:
- image: rust:1.53.0
- image: rust:1.55.0
steps:
- checkout:
path: ~/project
Expand All @@ -213,7 +213,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand All @@ -228,12 +228,12 @@ jobs:
- run:
name: Install check_contract
# Uses --debug for compilation speed
command: cargo install --debug --version 1.0.0-beta2 --features iterator --example check_contract -- cosmwasm-vm
command: cargo install --debug --version 1.0.0-beta2 --features iterator --example check_contract --locked -- cosmwasm-vm
- save_cache:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-wasm-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: |
Expand Down

0 comments on commit dab3e6c

Please sign in to comment.