From d657da2029eeb2d833d981ff3ad179dc5ded4fd2 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Tue, 5 Nov 2024 23:14:32 +0100 Subject: [PATCH] ci: use ubuntu-latest Align CI setup with what has been done in https://github.com/Homebrew/brew/pull/18704 Use ubuntu-latest when the ubuntu version does not matter. ubunut-latest is equivalent to 22.04 right now so this does not change anything Our ubuntu 22.04 docker image is still used (this has not been modified) --- .github/workflows/autobump.yml | 2 +- .github/workflows/cache.yml | 2 +- .github/workflows/dispatch-build-bottle.yml | 2 +- .github/workflows/dispatch-rebottle.yml | 4 ++-- .github/workflows/publish-commit-bottles.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/scripts/check-labels.js | 2 +- .github/workflows/tests.yml | 12 ++++++------ .github/workflows/triage.yml | 2 +- cmd/determine-rebottle-runners.rb | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/autobump.yml b/.github/workflows/autobump.yml index aca509041e810..3136c5e9db51c 100644 --- a/.github/workflows/autobump.yml +++ b/.github/workflows/autobump.yml @@ -25,7 +25,7 @@ defaults: jobs: autobump: if: github.repository_owner == 'Homebrew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master env: diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index e550e5c172b9d..eb466df102e7c 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -31,7 +31,7 @@ concurrency: jobs: determine-runners: if: github.repository_owner == 'Homebrew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml index 1ac225eb5163a..93b9de5d01b2b 100644 --- a/.github/workflows/dispatch-build-bottle.yml +++ b/.github/workflows/dispatch-build-bottle.yml @@ -52,7 +52,7 @@ permissions: jobs: prepare: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: diff --git a/.github/workflows/dispatch-rebottle.yml b/.github/workflows/dispatch-rebottle.yml index 3f6d4211e2499..d82a6a8a7695e 100644 --- a/.github/workflows/dispatch-rebottle.yml +++ b/.github/workflows/dispatch-rebottle.yml @@ -57,7 +57,7 @@ env: jobs: setup: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: @@ -133,7 +133,7 @@ jobs: pull-requests: write # for gh pr attestations: write # for actions/attest-build-provenance id-token: write # for actions/attest-build-provenance - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: bottle if: inputs.upload container: diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml index 21daf6426fbb3..b13e4f6831e2e 100644 --- a/.github/workflows/publish-commit-bottles.yml +++ b/.github/workflows/publish-commit-bottles.yml @@ -261,7 +261,7 @@ jobs: fromJson(needs.check.outputs.requires_merge) && fromJson(needs.check.outputs.bottles) && !fromJson(needs.check.outputs.replace) - runs-on: ${{inputs.large_runner && 'homebrew-large-bottle-upload' || 'ubuntu-22.04'}} + runs-on: ${{inputs.large_runner && 'homebrew-large-bottle-upload' || 'ubuntu-latest'}} container: image: ghcr.io/homebrew/ubuntu22.04:master volumes: diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 06b67eecaa807..bafa810644d1c 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -30,7 +30,7 @@ env: jobs: create_matrix: if: startsWith( github.repository, 'Homebrew/' ) - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: diff --git a/.github/workflows/scripts/check-labels.js b/.github/workflows/scripts/check-labels.js index 7b8f3783bdef8..88a3543da3d77 100644 --- a/.github/workflows/scripts/check-labels.js +++ b/.github/workflows/scripts/check-labels.js @@ -24,7 +24,7 @@ module.exports = async ({github, context, core}, formulae_detect, dependent_test return } - var linux_runner = 'ubuntu-22.04' + var linux_runner = 'ubuntu-latest' if (label_names.includes(`CI-linux-self-hosted${deps_suffix}`)) { linux_runner = 'linux-self-hosted-1' } else if (label_names.includes(`CI-linux-large-runner${deps_suffix}`)) { diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d77939614dcc0..ca2bd34ea4aaa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: matrix: stable: [false, true] name: tap_syntax${{ matrix.stable && ' (stable)' || '' }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest continue-on-error: ${{ matrix.stable }} container: image: ghcr.io/homebrew/ubuntu22.04:${{ matrix.stable && 'latest' || 'master'}} @@ -65,7 +65,7 @@ jobs: formulae_detect: if: github.repository_owner == 'Homebrew' && github.event_name != 'push' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: @@ -133,7 +133,7 @@ jobs: permissions: pull-requests: read if: github.repository_owner == 'Homebrew' && github.event_name == 'pull_request' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: formulae_detect outputs: syntax-only: ${{ steps.check-labels.outputs.syntax-only }} @@ -179,7 +179,7 @@ jobs: if: > github.event_name == 'pull_request' && !fromJson(needs.setup_tests.outputs.syntax-only) - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: @@ -249,7 +249,7 @@ jobs: permissions: pull-requests: read if: github.repository_owner == 'Homebrew' && github.event_name == 'pull_request' - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: [setup_tests, formulae_detect] outputs: syntax-only: ${{ steps.check-labels.outputs.syntax-only }} @@ -296,7 +296,7 @@ jobs: github.event_name == 'pull_request' && !fromJson(needs.setup_dep_tests.outputs.syntax-only) && fromJson(needs.setup_dep_tests.outputs.test-dependents) - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: ghcr.io/homebrew/ubuntu22.04:master outputs: diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index fdd857408b7ad..956554efe81a1 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -91,7 +91,7 @@ jobs: close: true triage: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: read issues: write diff --git a/cmd/determine-rebottle-runners.rb b/cmd/determine-rebottle-runners.rb index cda069a737366..d03deff44ea42 100755 --- a/cmd/determine-rebottle-runners.rb +++ b/cmd/determine-rebottle-runners.rb @@ -27,7 +27,7 @@ def run linux_runner = if timeout > 360 "linux-self-hosted-1" else - "ubuntu-22.04" + "ubuntu-latest" end linux_runner_spec = { runner: linux_runner,