Skip to content

Commit

Permalink
Update Rust Docker version in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
shanev committed Apr 21, 2022
1 parent 8e30c95 commit 3955c19
Showing 1 changed file with 18 additions and 21 deletions.
39 changes: 18 additions & 21 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.55.0
- image: rust:1.58.1
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.55.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -53,12 +53,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}

key: cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

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

key: cargocache-cw721-metadata-onchain-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

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

key: cargocache-cw721-fixed-price-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

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

lint:
docker:
- image: rust:1.55.0
- image: rust:1.58.1
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.55.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -196,15 +193,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.58.1-{{ 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.55.0
- image: rust:1.58.1
steps:
- checkout:
path: ~/project
Expand All @@ -213,7 +210,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand All @@ -233,7 +230,7 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: |
Expand Down

0 comments on commit 3955c19

Please sign in to comment.