From 2f73ca19b69aa97c274801e409d84be5e493bf73 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Sat, 2 Nov 2024 22:43:00 +0100 Subject: [PATCH 1/2] ci: move to ubuntu latest 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..ac0d6e3672ffe 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-latest 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..30b8ade7f58ab 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-latest permissions: actions: read contents: read diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fe897d9a828dc..5ba285b354ed4 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-latest strategy: fail-fast: false matrix: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f46e17e60fa73..dbeb6290143d3 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-latest steps: - name: Set up Homebrew id: set-up-homebrew diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml index 169d58de15163..7dfa3abbbe15f 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-latest outputs: runners: ${{ steps.determine-runners.outputs.runners }} steps: diff --git a/.github/workflows/rubydoc.yml b/.github/workflows/rubydoc.yml index b239e6a782f3b..78f13b011e0fa 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-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/rubydoc/Gemfile steps: diff --git a/.github/workflows/schemas.yml b/.github/workflows/schemas.yml index 3afa4c9d072e6..b7d5a3b454321 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-latest steps: - name: Set up Homebrew id: set-up-homebrew diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index 2b61db8899c2c..65d68d6f620b3 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-latest 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..a78da65cac213 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-latest if: github.repository == 'Homebrew/brew' steps: - name: Setup Homebrew diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 701579ae9d490..6bd2be4d41f35 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-latest 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-latest 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 Latest) + runs-on: ubuntu-latest - 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..6ec0a95d7a608 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-latest steps: - name: Set up Homebrew id: set-up-homebrew From 5bf31cbe6584f441f964b75fd06382d94e3a71ac Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 4 Nov 2024 09:13:49 +0000 Subject: [PATCH 2/2] workflows/tests: tweak update-test name. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6bd2be4d41f35..992984271a6a6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -225,7 +225,7 @@ jobs: strategy: matrix: include: - - name: update-test (Ubuntu Latest) + - name: update-test (Ubuntu) runs-on: ubuntu-latest - name: update-test (macOS) runs-on: macos-15