From 85ec5d573e70a1258ace8c6675df73f4bf3f2735 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Sat, 2 Nov 2024 22:43:00 +0100 Subject: [PATCH] ci: move to ubuntu 24.04 Move to ubuntu 24.04 which is out for some time now. Add coverage test using ubuntu 24.04 Not changing the default build CI version for core yet. --- .github/workflows/autogenerated-files.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/doctor.yml | 2 +- .github/workflows/rubydoc.yml | 2 +- .github/workflows/schemas.yml | 2 +- .github/workflows/spdx.yml | 2 +- .../sponsors-maintainers-man-completions.yml | 2 +- .github/workflows/tests.yml | 11 +++++++---- .github/workflows/vendor-version.yml | 2 +- 11 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/autogenerated-files.yml b/.github/workflows/autogenerated-files.yml index 4e4ff5f02933c..b25293e4e21fd 100644 --- a/.github/workflows/autogenerated-files.yml +++ b/.github/workflows/autogenerated-files.yml @@ -22,7 +22,7 @@ defaults: jobs: autogenerated: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository == 'Homebrew/brew' steps: - name: Set up Homebrew diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 333ba2a0f0de9..4002083e8b7de 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -15,7 +15,7 @@ defaults: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fe897d9a828dc..587a7e1093075 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,7 +21,7 @@ jobs: ubuntu: if: github.repository_owner == 'Homebrew' name: docker (Ubuntu ${{ matrix.version }}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f46e17e60fa73..765ae458222ca 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -23,7 +23,7 @@ defaults: jobs: docs: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Homebrew id: set-up-homebrew diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml index 169d58de15163..93d89170f5efa 100644 --- a/.github/workflows/doctor.yml +++ b/.github/workflows/doctor.yml @@ -22,7 +22,7 @@ defaults: jobs: determine-runners: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: runners: ${{ steps.determine-runners.outputs.runners }} steps: diff --git a/.github/workflows/rubydoc.yml b/.github/workflows/rubydoc.yml index b239e6a782f3b..3d0690ea1bb22 100644 --- a/.github/workflows/rubydoc.yml +++ b/.github/workflows/rubydoc.yml @@ -23,7 +23,7 @@ defaults: jobs: rubydoc: if: github.repository == 'Homebrew/brew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: BUNDLE_GEMFILE: ${{ github.workspace }}/rubydoc/Gemfile steps: diff --git a/.github/workflows/schemas.yml b/.github/workflows/schemas.yml index 3afa4c9d072e6..50ded7eee5a1c 100644 --- a/.github/workflows/schemas.yml +++ b/.github/workflows/schemas.yml @@ -19,7 +19,7 @@ defaults: jobs: spdx: if: github.repository == 'Homebrew/brew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Homebrew id: set-up-homebrew diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index 2b61db8899c2c..de5363c9dcac6 100644 --- a/.github/workflows/spdx.yml +++ b/.github/workflows/spdx.yml @@ -19,7 +19,7 @@ defaults: jobs: spdx: if: github.repository == 'Homebrew/brew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Homebrew id: set-up-homebrew diff --git a/.github/workflows/sponsors-maintainers-man-completions.yml b/.github/workflows/sponsors-maintainers-man-completions.yml index 24db26bd46a70..62369a21432c3 100644 --- a/.github/workflows/sponsors-maintainers-man-completions.yml +++ b/.github/workflows/sponsors-maintainers-man-completions.yml @@ -27,7 +27,7 @@ defaults: jobs: updates: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository == 'Homebrew/brew' steps: - name: Setup Homebrew diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 701579ae9d490..2fe67272c6376 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ concurrency: jobs: syntax: if: github.repository_owner == 'Homebrew' - runs-on: ubuntu-22.04 + runs-on: ubuntu-4.04 steps: - name: Set up Homebrew id: set-up-homebrew @@ -193,7 +193,7 @@ jobs: vendored-gems: name: vendored gems needs: syntax - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Homebrew id: set-up-homebrew @@ -225,8 +225,8 @@ jobs: strategy: matrix: include: - - name: update-test (Ubuntu 22.04) - runs-on: ubuntu-22.04 + - name: update-test (Ubuntu 24.04) + runs-on: ubuntu-24.04 - name: update-test (macOS) runs-on: macos-15 steps: @@ -257,6 +257,9 @@ jobs: - name: tests (generic OS) test-flags: --generic --coverage runs-on: ubuntu-latest + - name: tests (Ubuntu 24.04) + test-flags: --coverage + runs-on: ubuntu-24.04 - name: tests (Ubuntu 22.04) test-flags: --coverage runs-on: ubuntu-22.04 diff --git a/.github/workflows/vendor-version.yml b/.github/workflows/vendor-version.yml index 9ad05652ee82a..b5f2bbaa5eba3 100644 --- a/.github/workflows/vendor-version.yml +++ b/.github/workflows/vendor-version.yml @@ -15,7 +15,7 @@ defaults: jobs: check-vendor-version: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Homebrew id: set-up-homebrew