Skip to content

Commit

Permalink
CI: fix macOS build for recent Homebrew update (#1355)
Browse files Browse the repository at this point in the history
  • Loading branch information
fantix authored Jul 23, 2024
1 parent 48d5884 commit e9b80be
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 10 deletions.
12 changes: 11 additions & 1 deletion .github/workflows.src/build.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,18 @@
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.
brew update
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2
if: << 'false' if tgt.runs_on and 'self-hosted' in tgt.runs_on else 'true' >>
with:
components: "cargo,rustc,rust-std"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
nightly.yml linguist-generated=true
release.yml linguist-generated=true
testing.yml linguist-generated=true
tests.yml linguist-generated=true
4 changes: 2 additions & 2 deletions .github/workflows/install_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Systemd version
run: "systemd --version"
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2
with:
components: "cargo,rustc,rust-std"
toolchain: "stable"
Expand All @@ -45,7 +45,7 @@ jobs:
submodules: true

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2
with:
components: "cargo,rustc,rust-std"
toolchain: "stable"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: "sudo apt-get install musl-tools"

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
uses: dtolnay/rust-toolchain@d0e72ca3bfdc51937a4f81431ccbed269ef9f2a2
with:
components: "cargo,rustc,rust-std"
toolchain: "stable"
Expand Down
24 changes: 22 additions & 2 deletions .github/workflows/nightly.yml

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

24 changes: 22 additions & 2 deletions .github/workflows/release.yml

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

24 changes: 22 additions & 2 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 e9b80be

Please sign in to comment.