Skip to content

Commit

Permalink
update rustc 1.65 -> 1.71
Browse files Browse the repository at this point in the history
  • Loading branch information
seinj0312 committed Jun 13, 2024
1 parent 163e787 commit 8cf5a26
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
38 changes: 19 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ workflows:
jobs:
contract_cw721_base:
docker:
- image: rust:1.65.0
- image: rust:1.71.0
working_directory: ~/project/contracts/cw721-base
steps:
- checkout:
Expand All @@ -32,7 +32,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-base-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-base-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -42,11 +42,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-base-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-base-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw721_expiration:
docker:
- image: rust:1.65.0
- image: rust:1.71.0
working_directory: ~/project/contracts/cw721-expiration
steps:
- checkout:
Expand All @@ -56,7 +56,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-expiration-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-expiration-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -78,11 +78,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-expiration-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-expiration-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}

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

contract_cw721_receiver_tester:
docker:
- image: rust:1.65.0
- image: rust:1.71.0
working_directory: ~/project/contracts/cw721-receiver-tester
steps:
- checkout:
Expand All @@ -128,7 +128,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw721-receiver-tester-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw721-receiver-tester-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -150,11 +150,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw721-receiver-tester-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw721-receiver-tester-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}

package_cw721:
docker:
- image: rust:1.65.0
- image: rust:1.71.0
working_directory: ~/project/packages/cw721
steps:
- checkout:
Expand Down Expand Up @@ -191,15 +191,15 @@ jobs:

lint:
docker:
- image: rust:1.65.0
- image: rust:1.71.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.65.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.71.0-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -218,15 +218,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.65.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.71.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.65.0
- image: rust:1.71.0
steps:
- checkout:
path: ~/project
Expand All @@ -235,7 +235,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand All @@ -255,7 +255,7 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust:1.71.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "Apache-2.0"
repository = "https://github.com/CosmWasm/cw-nfts"
homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"
rust-version = "1.65"
rust-version = "1.71"

[workspace.dependencies]
cosmwasm-schema = "^1.2"
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw721-base/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ If provided, it is expected that the _token_uri_ points to a JSON file following

## Running this contract

You will need Rust 1.65+ with `wasm32-unknown-unknown` target installed.
You will need Rust 1.71+ with `wasm32-unknown-unknown` target installed.

You can run unit tests on this via:

Expand Down

0 comments on commit 8cf5a26

Please sign in to comment.