From 8cf5a2646addfea2c61e339868bb82c600411a5a Mon Sep 17 00:00:00 2001 From: seinj0312 Date: Thu, 13 Jun 2024 15:10:27 +0200 Subject: [PATCH] update rustc 1.65 -> 1.71 --- .circleci/config.yml | 38 +++++++++++++++++----------------- Cargo.toml | 2 +- contracts/cw721-base/README.md | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 479bafb..2345c74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -191,7 +191,7 @@ jobs: lint: docker: - - image: rust:1.65.0 + - image: rust:1.71.0 steps: - checkout - run: @@ -199,7 +199,7 @@ jobs: 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 @@ -218,7 +218,7 @@ 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 @@ -226,7 +226,7 @@ jobs: # 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 @@ -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 @@ -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 diff --git a/Cargo.toml b/Cargo.toml index 9f7ef2f..86fba0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/contracts/cw721-base/README.md b/contracts/cw721-base/README.md index d3be359..41ddf52 100644 --- a/contracts/cw721-base/README.md +++ b/contracts/cw721-base/README.md @@ -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: