From e05cc3e983c435e850532592f9d69f7b085164c3 Mon Sep 17 00:00:00 2001 From: Hubert Bugaj Date: Thu, 30 Jan 2025 14:27:14 +0100 Subject: [PATCH 1/2] chore: less buildjet --- .github/workflows/docker.yml | 18 +++++++++--------- .github/workflows/forest.yml | 2 +- .github/workflows/unit-tests.yml | 4 ---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8533163f358..0201f0277f3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,9 +34,9 @@ env: CXX: sccache clang++ jobs: - build-ubuntu-2204-amd64: - name: Build forest binaries on Ubuntu-22.04-amd64 - runs-on: ubuntu-22.04 + build-ubuntu-amd64: + name: Build forest binaries on Linux AMD64 + runs-on: ubuntu-24.04 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false @@ -74,9 +74,9 @@ jobs: ~/.cargo/bin/forest* if-no-files-found: error - build-ubuntu-2204-arm64: - name: Build forest binaries on Ubuntu-22.04-arm64 - runs-on: buildjet-8vcpu-ubuntu-2204-arm + build-ubuntu-arm64: + name: Build forest binaries on Ubuntu ARM64 + runs-on: ubuntu-24.04-arm # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false @@ -121,14 +121,14 @@ jobs: build-and-push-docker-image: name: Build images and push to GHCR - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false timeout-minutes: 30 needs: - - build-ubuntu-2204-amd64 - - build-ubuntu-2204-arm64 + - build-ubuntu-amd64 + - build-ubuntu-arm64 steps: - name: List cached docker images run: docker image ls diff --git a/.github/workflows/forest.yml b/.github/workflows/forest.yml index 8dde190044c..a95d731e90d 100644 --- a/.github/workflows/forest.yml +++ b/.github/workflows/forest.yml @@ -547,7 +547,7 @@ jobs: needs: - build-ubuntu name: Calibnet snapshot parity checks - runs-on: buildjet-8vcpu-ubuntu-2204 + runs-on: ubuntu-24.04 # Run the job only on main to limit the runner cost. # The downside is that the offending commit can only be caught after being merged # and a manual revert is required. diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 94d0c21e060..02f97cbeccf 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -36,8 +36,6 @@ env: jobs: tests: - # Change to `buildjet-8vcpu-ubuntu-2204` if `fuzzy` is down. - # runs-on: fuzzy runs-on: buildjet-8vcpu-ubuntu-2204 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. @@ -57,8 +55,6 @@ jobs: uses: taiki-e/install-action@nextest - run: make test tests-release: - # Change to `buildjet-8vcpu-ubuntu-2204` if `fuzzy` is down. - # runs-on: fuzzy runs-on: buildjet-8vcpu-ubuntu-2204 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. From 2cd4a60a23c7c67e176a54af7b61d18449742d54 Mon Sep 17 00:00:00 2001 From: Hubert Bugaj Date: Thu, 30 Jan 2025 16:50:02 +0100 Subject: [PATCH 2/2] revert to ubuntu-22 --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0201f0277f3..487f28b7c8b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -36,7 +36,7 @@ env: jobs: build-ubuntu-amd64: name: Build forest binaries on Linux AMD64 - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false @@ -76,7 +76,7 @@ jobs: build-ubuntu-arm64: name: Build forest binaries on Ubuntu ARM64 - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-22.04-arm # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false @@ -121,7 +121,7 @@ jobs: build-and-push-docker-image: name: Build images and push to GHCR - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 # Run the job only if the PR is not a draft. # This is done to limit the runner cost. if: github.event.pull_request.draft == false