From a8e33f68066efc8be8ce72926d809bca338e5865 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Mon, 19 Aug 2024 14:30:53 -0400 Subject: [PATCH] Fix for Rust toolchain issues (#7660) Switch to `dsherret/rust-toolchain-file@v1` to make build more reliable. --- .github/workflows.src/build.inc.yml | 6 +----- .github/workflows.src/ls-build.inc.yml | 6 +----- .github/workflows.src/tests.inc.yml | 7 ++----- .github/workflows.src/tests.tpl.yml | 10 +++++----- .github/workflows/dryrun.yml | 12 ++---------- .github/workflows/ls-nightly.yml | 12 ++---------- .github/workflows/nightly.yml | 12 ++---------- .github/workflows/release.yml | 12 ++---------- .github/workflows/testing.yml | 12 ++---------- .github/workflows/tests-ha.yml | 7 ++----- .github/workflows/tests-managed-pg.yml | 7 ++----- .github/workflows/tests-patches.yml | 7 ++----- .github/workflows/tests-pg-versions.yml | 7 ++----- .github/workflows/tests-pool.yml | 7 ++----- .github/workflows/tests.yml | 17 +++++++---------- rust-toolchain.toml | 4 ++-- 16 files changed, 38 insertions(+), 107 deletions(-) diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml index 6c8b7a42a49..b27887cb4ca 100644 --- a/.github/workflows.src/build.inc.yml +++ b/.github/workflows.src/build.inc.yml @@ -146,12 +146,8 @@ brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >> - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "<< tgt.arch >>-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows.src/ls-build.inc.yml b/.github/workflows.src/ls-build.inc.yml index f91e080d51c..b54446c2285 100644 --- a/.github/workflows.src/ls-build.inc.yml +++ b/.github/workflows.src/ls-build.inc.yml @@ -133,12 +133,8 @@ path: edgedb-pkg - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >> - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "<< tgt.arch >>-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows.src/tests.inc.yml b/.github/workflows.src/tests.inc.yml index abbf0242887..7af03b5bd82 100644 --- a/.github/workflows.src/tests.inc.yml +++ b/.github/workflows.src/tests.inc.yml @@ -125,14 +125,11 @@ sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows.src/tests.tpl.yml b/.github/workflows.src/tests.tpl.yml index 4ce54b8d121..67cf2c67ea7 100644 --- a/.github/workflows.src/tests.tpl.yml +++ b/.github/workflows.src/tests.tpl.yml @@ -58,11 +58,8 @@ jobs: path: ${{ env.BUILD_TEMP }}/rust/extensions key: edb-rust-build-v1-${{ hashFiles('.tmp/rust_cache_key.txt') }} - - name: Install rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + - name: Install Rust toolchain + uses: dsherret/rust-toolchain-file@v1 - name: Cargo test env: @@ -89,6 +86,9 @@ jobs: # Run the test + - name: Install Rust toolchain + uses: dsherret/rust-toolchain-file@v1 + - name: Test env: SHARD: ${{ matrix.shard }} diff --git a/.github/workflows/dryrun.yml b/.github/workflows/dryrun.yml index 595b2c2ed71..432e62b14c9 100644 --- a/.github/workflows/dryrun.yml +++ b/.github/workflows/dryrun.yml @@ -988,12 +988,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "x86_64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 @@ -1056,12 +1052,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "aarch64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/ls-nightly.yml b/.github/workflows/ls-nightly.yml index d1b47e6bdd2..5236fdd8dcf 100644 --- a/.github/workflows/ls-nightly.yml +++ b/.github/workflows/ls-nightly.yml @@ -231,12 +231,8 @@ jobs: path: edgedb-pkg - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "x86_64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 @@ -290,12 +286,8 @@ jobs: path: edgedb-pkg - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "aarch64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 09d6b16823a..5b53c926736 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -993,12 +993,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "x86_64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 @@ -1061,12 +1057,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "aarch64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b58196afd30..53986894828 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -535,12 +535,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "x86_64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 @@ -601,12 +597,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "aarch64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9cea489e71b..68c88f90ab1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -557,12 +557,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "x86_64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 @@ -624,12 +620,8 @@ jobs: brew update - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 + uses: dsherret/rust-toolchain-file@v1 if: true - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" - targets: "aarch64-apple-darwin" - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/tests-ha.yml b/.github/workflows/tests-ha.yml index b5309c902e3..b4c12ed3459 100644 --- a/.github/workflows/tests-ha.yml +++ b/.github/workflows/tests-ha.yml @@ -166,14 +166,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows/tests-managed-pg.yml b/.github/workflows/tests-managed-pg.yml index c734a3d4bff..de713cb0185 100644 --- a/.github/workflows/tests-managed-pg.yml +++ b/.github/workflows/tests-managed-pg.yml @@ -151,14 +151,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows/tests-patches.yml b/.github/workflows/tests-patches.yml index abb21fbb64f..74a61ffefbe 100644 --- a/.github/workflows/tests-patches.yml +++ b/.github/workflows/tests-patches.yml @@ -153,14 +153,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows/tests-pg-versions.yml b/.github/workflows/tests-pg-versions.yml index e9da4f18e91..1d8ef6bc524 100644 --- a/.github/workflows/tests-pg-versions.yml +++ b/.github/workflows/tests-pg-versions.yml @@ -151,14 +151,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows/tests-pool.yml b/.github/workflows/tests-pool.yml index 70d078a59e6..aac9ba6f361 100644 --- a/.github/workflows/tests-pool.yml +++ b/.github/workflows/tests-pool.yml @@ -161,14 +161,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 499fa5bb170..89714b8e952 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -163,14 +163,11 @@ jobs: sudo apt-get update sudo apt-get install -y uuid-dev libreadline-dev bison flex - - name: Install rust toolchain + - name: Install Rust toolchain if: | steps.cli-cache.outputs.cache-hit != 'true' || steps.rust-cache.outputs.cache-hit != 'true' - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + uses: dsherret/rust-toolchain-file@v1 # Build EdgeDB CLI @@ -406,11 +403,8 @@ jobs: path: ${{ env.BUILD_TEMP }}/rust/extensions key: edb-rust-build-v1-${{ hashFiles('.tmp/rust_cache_key.txt') }} - - name: Install rust toolchain - uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2 - with: - components: "cargo,rustc,rust-std" - toolchain: "stable" + - name: Install Rust toolchain + uses: dsherret/rust-toolchain-file@v1 - name: Cargo test env: @@ -573,6 +567,9 @@ jobs: # Run the test + - name: Install Rust toolchain + uses: dsherret/rust-toolchain-file@v1 + - name: Test env: SHARD: ${{ matrix.shard }} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index aa060365b72..2f69b4471fd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80" - +channel = "1.80.1" +components = [ "rustfmt", "clippy" ]