From 031a9ba415bf70653d990cbd58f5d0ebeabf2d8c Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:14:23 -0700 Subject: [PATCH] Set MSRV --- .circleci/config.yml | 20 ++++++++++---------- .github/workflows/release.yml | 2 +- Cargo.toml | 1 + rust-toolchain | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 rust-toolchain diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d892cd004..d366608649 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 # - Incremental builds should be disabled in CI, since they don't provide much benefit. environment: - RUST_VERSION: "1.77.1" # Ensure that this matches the `rust-version` in `Cargo.toml`. + RUST_VERSION: "1.82.0" # Ensure that this matches the `rust-version` in `Cargo.toml`. orbs: windows: circleci/windows@5.0 @@ -15,11 +15,11 @@ executors: macos-executor: macos: xcode: "16.0.0" # Use appropriate Xcode version - resource_class: xlarge + resource_class: m2pro.large linux-executor: docker: - - image: "cimg/rust:1.77.1" # Ensure that this matches the `rust-version` in `Cargo.toml`. + - image: "cimg/rust:1.82.0" # Ensure that this matches the `rust-version` in `Cargo.toml`. commands: @@ -164,7 +164,7 @@ jobs: check-style: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - checkout @@ -183,7 +183,7 @@ jobs: clippy: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - checkout @@ -203,7 +203,7 @@ jobs: leo-executable: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - checkout @@ -225,7 +225,7 @@ jobs: leo-new: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - attach_workspace: @@ -238,7 +238,7 @@ jobs: leo-clean: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - attach_workspace: @@ -251,7 +251,7 @@ jobs: leo-example: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - attach_workspace: @@ -264,7 +264,7 @@ jobs: test-examples: docker: - - image: cimg/rust:1.76 + - image: cimg/rust:1.82 resource_class: xlarge steps: - attach_workspace: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61d83ca6b9..4bfcba93e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: macos: name: macOS - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/Cargo.toml b/Cargo.toml index b2e30b6ac6..e51d232642 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ include = [ ] license = "GPL-3.0" edition = "2021" +rust-version = "1.82.0" # Be sure to update CI and the ./rust-toolchain file. [workspace] members = [ diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000000..71fae54fb2 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.82.0