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.

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

Jump to bottom

Update rust toolchain to v1.58.1 #58

Merged
merged 2 commits into from
Jan 31, 2022
Merged

Update rust toolchain to v1.58.1 #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a82bb3b
Update rust toolchain to v1.56.1
uint Jan 31, 2022
1aea09d
Update rust toolchain to v1.58.1
uint Jan 31, 2022
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
74 changes: 37 additions & 37 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ workflows:
jobs:
contract_tg4_engagement:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tg4-engagement
steps:
- checkout:
Expand All @@ -49,7 +49,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tg4-engagement-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tg4-engagement-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -62,11 +62,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tg4-engagement-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tg4-engagement-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tg4_mixer:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tg4-mixer
steps:
- checkout:
Expand All @@ -76,7 +76,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tg4-mixer-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tg4-mixer-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -89,11 +89,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tg4-mixer-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tg4-mixer-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tg4_stake:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tg4-stake
steps:
- checkout:
Expand All @@ -103,7 +103,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tg4-stake-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tg4-stake-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -116,11 +116,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tg4-stake-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tg4-stake-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tgrade_gov_reflect:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tgrade-gov-reflect
steps:
- checkout:
Expand All @@ -130,7 +130,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tgrade-gov-reflect-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tgrade-gov-reflect-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -143,11 +143,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tgrade-gov-reflect-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tgrade-gov-reflect-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tgrade_valset:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tgrade-valset
steps:
- checkout:
Expand All @@ -157,7 +157,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tgrade-valset-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tgrade-valset-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -170,11 +170,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tgrade-valset-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tgrade-valset-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tgrade_validator_voting:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tgrade-validator-voting
steps:
- checkout:
Expand All @@ -184,7 +184,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tgrade-validator-voting-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tgrade-validator-voting-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -197,11 +197,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tgrade-validator-voting-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tgrade-validator-voting-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tgrade_vesting_account:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tgrade-vesting-account
steps:
- checkout:
Expand All @@ -211,7 +211,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tgrade-vesting-account-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tgrade-vesting-account-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -233,11 +233,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tgrade-vesting-account-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tgrade-vesting-account-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}

contract_tgrade_community_pool:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/contracts/tgrade-community-pool
steps:
- checkout:
Expand All @@ -247,7 +247,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-tgrade-validator-voting-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-tgrade-validator-voting-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -260,12 +260,12 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-tgrade-validator-voting-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-tgrade-validator-voting-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}


package_bindings:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/bindings
steps:
- checkout:
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:

package_bindings_test:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/bindings-test
steps:
- checkout:
Expand All @@ -318,7 +318,7 @@ jobs:

package_utils:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/utils
steps:
- checkout:
Expand All @@ -344,7 +344,7 @@ jobs:

package_tg4:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/tg4
steps:
- checkout:
Expand Down Expand Up @@ -372,7 +372,7 @@ jobs:

package_voting_contract:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/voting-contract
steps:
- checkout:
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:

package_test_utils:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project/packages/test-utils
steps:
- checkout:
Expand All @@ -425,15 +425,15 @@ jobs:

lint:
docker:
- image: rust:1.54.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.54.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 @@ -453,15 +453,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.54.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.54.0
- image: rust:1.58.1
steps:
- checkout:
path: ~/project
Expand All @@ -470,7 +470,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust:1.54.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 @@ -490,7 +490,7 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-wasm-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: |
Expand Down Expand Up @@ -548,7 +548,7 @@ jobs:

build_and_upload_schemas:
docker:
- image: rust:1.54.0
- image: rust:1.58.1
working_directory: ~/project
steps:
- checkout:
Expand Down