diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml index 7a65009379a..08adf4b5a2c 100644 --- a/.github/workflows.src/build.inc.yml +++ b/.github/workflows.src/build.inc.yml @@ -131,8 +131,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" diff --git a/.github/workflows/dryrun.yml b/.github/workflows/dryrun.yml index 4fc67adadf3..150271abd78 100644 --- a/.github/workflows/dryrun.yml +++ b/.github/workflows/dryrun.yml @@ -901,8 +901,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" @@ -959,8 +969,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index af26c38fb72..40a22e13b3d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -906,8 +906,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" @@ -964,8 +974,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07e0b0bc728..43622704d86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -502,8 +502,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" @@ -558,8 +568,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2c8e0219638..110902a434c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -523,8 +523,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std" @@ -580,8 +590,18 @@ jobs: 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: true with: components: "cargo,rustc,rust-std"