From 91ad65e29034016eff3a356167eb4bd73d0662d3 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 8 Jan 2025 13:26:57 +0000 Subject: [PATCH] . --- .github/ensure-builder/install | 5 ++++- .github/workflows/ci.yml | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ensure-builder/install b/.github/ensure-builder/install index 336b20d68d0..9dae316f12c 100755 --- a/.github/ensure-builder/install +++ b/.github/ensure-builder/install @@ -31,6 +31,9 @@ if ! command -v jq >/dev/null; then chmod +x ./jq sudo mv ./jq /usr/bin/jq fi +if ! rustup show | grep "1.75" > /dev/null; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0 +fi function install_parallel() { sudo apt update && sudo systemctl stop unattended-upgrades && sudo apt install parallel } @@ -38,4 +41,4 @@ export -f install_parallel if ! command -v parallel >/dev/null; then DENOISE=1 ci3/denoise ci3/retry install_parallel fi -[ -x /usr/local/bin/earthly ] || ci3/dump_fail ci3/earthly_install \ No newline at end of file +[ -x /usr/local/bin/earthly ] || ci3/dump_fail ci3/earthly_install diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2774760beec..19d5d3b2bff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -527,8 +527,6 @@ jobs: runner_type: builder-x86 run: | export CI=1 USE_CACHE=1 - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0 - if ci3/test_should_run "boxes-test-$(./boxes/bootstrap.sh hash)"; then ./bootstrap.sh test-boxes fi