Skip to content

Commit

Permalink
CI: fix Rust toolchain on macOS (#7674)
Browse files Browse the repository at this point in the history
Co-authored-by: Matt Mastracci <[email protected]>
  • Loading branch information
fantix and mmastrac authored Aug 22, 2024
1 parent 5f8cf7b commit 038a2cc
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 63 deletions.
21 changes: 14 additions & 7 deletions .github/workflows.src/build.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,26 +129,33 @@
<% endif %>

steps:
- uses: actions/checkout@v4
with:
repository: edgedb/edgedb-pkg
ref: master
path: edgedb-pkg

- name: Update Homebrew before installing Rust toolchain
run: |
# Homebrew renamed `rustup-init` to `rustup`:
# https://github.com/Homebrew/homebrew-core/pull/177840
# But the GitHub Action runner is not updated with this change yet.
# This caused the later `brew update` in step `Build` to relink Rust
# toolchain executables, overwriting the custom toolchain installed by
# `dtolnay/rust-toolchain`. So let's just run `brew update` early.
# `dsherret/rust-toolchain-file`. So let's just run `brew update` early.
brew update
- uses: actions/checkout@v4
if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >>
with:
sparse-checkout: |
rust-toolchain.toml
sparse-checkout-cone-mode: false

- name: Install Rust toolchain
uses: dsherret/rust-toolchain-file@v1
if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >>

- uses: actions/checkout@v4
with:
repository: edgedb/edgedb-pkg
ref: master
path: edgedb-pkg

- name: Set up Python
uses: actions/setup-python@v5
if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >>
Expand Down
42 changes: 28 additions & 14 deletions .github/workflows/dryrun.yml

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

42 changes: 28 additions & 14 deletions .github/workflows/nightly.yml

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

42 changes: 28 additions & 14 deletions .github/workflows/release.yml

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

42 changes: 28 additions & 14 deletions .github/workflows/testing.yml

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

0 comments on commit 038a2cc

Please sign in to comment.