diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml index b27887cb4ca..06ce1b83825 100644 --- a/.github/workflows.src/build.inc.yml +++ b/.github/workflows.src/build.inc.yml @@ -129,12 +129,6 @@ <% 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`: @@ -142,13 +136,26 @@ # 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' >> diff --git a/.github/workflows/dryrun.yml b/.github/workflows/dryrun.yml index 432e62b14c9..0567d0f19e9 100644 --- a/.github/workflows/dryrun.yml +++ b/.github/workflows/dryrun.yml @@ -971,12 +971,6 @@ jobs: 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`: @@ -984,13 +978,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true @@ -1035,12 +1042,6 @@ jobs: 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`: @@ -1048,13 +1049,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5b53c926736..5bbee515a53 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -976,12 +976,6 @@ jobs: 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`: @@ -989,13 +983,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true @@ -1040,12 +1047,6 @@ jobs: 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`: @@ -1053,13 +1054,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53986894828..cae596ff505 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -518,12 +518,6 @@ jobs: 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`: @@ -531,13 +525,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true @@ -580,12 +587,6 @@ jobs: 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`: @@ -593,13 +594,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 68c88f90ab1..4bb1c1ca79b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -540,12 +540,6 @@ jobs: 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`: @@ -553,13 +547,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true @@ -603,12 +610,6 @@ jobs: 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`: @@ -616,13 +617,26 @@ jobs: # 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: true + with: + sparse-checkout: | + rust-toolchain.toml + sparse-checkout-cone-mode: false + - name: Install Rust toolchain uses: dsherret/rust-toolchain-file@v1 if: 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: true