From 7b4afc7f32c6715b62f59b216ab36223880acadc Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Mon, 19 Aug 2024 11:36:41 -0400 Subject: [PATCH] Bump rust toolchain --- .github/workflows.src/build.inc.yml | 6 ++--- .github/workflows.src/tests.inc.yml | 6 +++++ .github/workflows/dryrun.yml | 12 ++++----- .github/workflows/nightly.yml | 12 ++++----- .github/workflows/release.yml | 12 ++++----- .github/workflows/testing.yml | 12 ++++----- .github/workflows/tests-ha.yml | 12 +++++++++ .github/workflows/tests-managed-pg.yml | 36 +++++++++++++++++++++++++ .github/workflows/tests-patches.yml | 12 +++++++++ .github/workflows/tests-pg-versions.yml | 12 +++++++++ .github/workflows/tests-pool.yml | 6 +++++ .github/workflows/tests.yml | 24 +++++++++++++++++ rust-toolchain.toml | 2 +- 13 files changed, 136 insertions(+), 28 deletions(-) diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml index 6c8b7a42a49..a0442a71c93 100644 --- a/.github/workflows.src/build.inc.yml +++ b/.github/workflows.src/build.inc.yml @@ -146,11 +146,11 @@ brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >> with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "<< tgt.arch >>-apple-darwin" - name: Set up Python diff --git a/.github/workflows.src/tests.inc.yml b/.github/workflows.src/tests.inc.yml index abbf0242887..e0dd5e0e3ad 100644 --- a/.github/workflows.src/tests.inc.yml +++ b/.github/workflows.src/tests.inc.yml @@ -9,6 +9,12 @@ fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/dryrun.yml b/.github/workflows/dryrun.yml index 595b2c2ed71..0101767c116 100644 --- a/.github/workflows/dryrun.yml +++ b/.github/workflows/dryrun.yml @@ -988,11 +988,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "x86_64-apple-darwin" - name: Set up Python @@ -1056,11 +1056,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "aarch64-apple-darwin" - name: Set up Python diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 09d6b16823a..1020bb699ac 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -993,11 +993,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "x86_64-apple-darwin" - name: Set up Python @@ -1061,11 +1061,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "aarch64-apple-darwin" - name: Set up Python diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b58196afd30..42b17607d17 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -535,11 +535,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "x86_64-apple-darwin" - name: Set up Python @@ -601,11 +601,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "aarch64-apple-darwin" - name: Set up Python diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9cea489e71b..4b61a3d1d26 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -557,11 +557,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "x86_64-apple-darwin" - name: Set up Python @@ -624,11 +624,11 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a if: true with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "1.80.1" targets: "aarch64-apple-darwin" - name: Set up Python diff --git a/.github/workflows/tests-ha.yml b/.github/workflows/tests-ha.yml index b5309c902e3..1ae95f52ccb 100644 --- a/.github/workflows/tests-ha.yml +++ b/.github/workflows/tests-ha.yml @@ -24,6 +24,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -360,6 +366,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/tests-managed-pg.yml b/.github/workflows/tests-managed-pg.yml index c734a3d4bff..e0de437de93 100644 --- a/.github/workflows/tests-managed-pg.yml +++ b/.github/workflows/tests-managed-pg.yml @@ -24,6 +24,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -391,6 +397,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -619,6 +631,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -895,6 +913,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -1137,6 +1161,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -1367,6 +1397,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/tests-patches.yml b/.github/workflows/tests-patches.yml index abb21fbb64f..e4fba165d10 100644 --- a/.github/workflows/tests-patches.yml +++ b/.github/workflows/tests-patches.yml @@ -26,6 +26,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -360,6 +366,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/tests-pg-versions.yml b/.github/workflows/tests-pg-versions.yml index e9da4f18e91..3ebba516d7b 100644 --- a/.github/workflows/tests-pg-versions.yml +++ b/.github/workflows/tests-pg-versions.yml @@ -24,6 +24,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -384,6 +390,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/tests-pool.yml b/.github/workflows/tests-pool.yml index 70d078a59e6..d6617a3c52a 100644 --- a/.github/workflows/tests-pool.yml +++ b/.github/workflows/tests-pool.yml @@ -34,6 +34,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 499fa5bb170..d6c446cc262 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -357,6 +363,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -443,6 +455,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python @@ -606,6 +624,12 @@ jobs: fetch-depth: 50 submodules: true + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + with: + components: "cargo,rustc,rust-std,rustfmt,clippy" + toolchain: "stable" + - name: Set up Python uses: actions/setup-python@v5 id: setup-python diff --git a/rust-toolchain.toml b/rust-toolchain.toml index aa060365b72..42ba0a0701a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80" +channel = "1.80.1"