Skip to content

Commit

Permalink
Fix for Rust toolchain issues (#7660)
Browse files Browse the repository at this point in the history
Switch to `dsherret/rust-toolchain-file@v1` to make build more reliable.
  • Loading branch information
mmastrac authored Aug 19, 2024
1 parent 266df6d commit a8e33f6
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 107 deletions.
6 changes: 1 addition & 5 deletions .github/workflows.src/build.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows.src/ls-build.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows.src/tests.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows.src/tests.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -89,6 +86,9 @@ jobs:

# Run the test

- name: Install Rust toolchain
uses: dsherret/rust-toolchain-file@v1

- name: Test
env:
SHARD: ${{ matrix.shard }}
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/dryrun.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions .github/workflows/ls-nightly.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions .github/workflows/nightly.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions .github/workflows/testing.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .github/workflows/tests-ha.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .github/workflows/tests-managed-pg.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .github/workflows/tests-patches.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .github/workflows/tests-pg-versions.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .github/workflows/tests-pool.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions .github/workflows/tests.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.80"

channel = "1.80.1"
components = [ "rustfmt", "clippy" ]

0 comments on commit a8e33f6

Please sign in to comment.