From 92cb2f8eb8b07660d3733a2314d353b1a9c82c0d Mon Sep 17 00:00:00 2001 From: davidlion Date: Fri, 25 Jul 2025 18:44:40 -0400 Subject: [PATCH 1/3] ci: Drop support for macos 13 and 14; Refactor to use hyphen lists even with single entries. --- .github/workflows/clp-core-build-macos.yaml | 2 -- .github/workflows/clp-core-build.yaml | 21 ++++++++++++------- .github/workflows/clp-docs.yaml | 8 ++++--- .../workflows/clp-execution-image-build.yaml | 6 ++++-- .github/workflows/clp-lint.yaml | 6 ++++-- .../clp-s-generated-code-checks.yaml | 6 ++++-- 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/.github/workflows/clp-core-build-macos.yaml b/.github/workflows/clp-core-build-macos.yaml index 51eb6985d0..ebf567cdb7 100644 --- a/.github/workflows/clp-core-build-macos.yaml +++ b/.github/workflows/clp-core-build-macos.yaml @@ -45,8 +45,6 @@ jobs: strategy: matrix: os: - - "macos-13" - - "macos-14" - "macos-15" use_shared_libs: - true diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index ad0ea8fbf2..4a9c611d61 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -42,7 +42,8 @@ concurrency: jobs: filter-relevant-changes: name: "filter-relevant-changes" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" outputs: centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" @@ -99,7 +100,8 @@ jobs: name: "centos-stream-9-deps-image" if: "needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true'" needs: "filter-relevant-changes" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -125,7 +127,8 @@ jobs: name: "ubuntu-jammy-deps-image" if: "needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'true'" needs: "filter-relevant-changes" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -160,7 +163,8 @@ jobs: use_shared_libs: [true, false] name: "centos-stream-9-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" continue-on-error: true - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -205,7 +209,8 @@ jobs: OS_NAME: "ubuntu-jammy" name: "ubuntu-jammy-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" continue-on-error: true - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -252,7 +257,8 @@ jobs: # Run if the ancestor jobs were successful/skipped and building clp was successful. if: "!cancelled() && !failure() && needs.ubuntu-jammy-binaries.result == 'success'" needs: "ubuntu-jammy-binaries" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" env: OS_NAME: "ubuntu-jammy" TMP_OUTPUT_DIR: "/tmp" @@ -319,7 +325,8 @@ jobs: needs: - "filter-relevant-changes" - "ubuntu-jammy-deps-image" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: diff --git a/.github/workflows/clp-docs.yaml b/.github/workflows/clp-docs.yaml index 82fc4a0e90..7507979d44 100644 --- a/.github/workflows/clp-docs.yaml +++ b/.github/workflows/clp-docs.yaml @@ -18,7 +18,9 @@ jobs: name: "build" strategy: matrix: - os: ["macos-latest", "ubuntu-latest"] + os: + - "macos-15" + - "ubuntu-24.04" runs-on: "${{matrix.os}}" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" @@ -34,7 +36,7 @@ jobs: shell: "bash" run: "npm install -g @go-task/cli" - - if: "matrix.os == 'macos-latest'" + - if: "matrix.os == 'macos-15'" name: "Install coreutils (for md5sum)" run: "brew install coreutils" @@ -46,7 +48,7 @@ jobs: - if: >- contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name) && ('refs/heads/main' == github.ref || startsWith(github.ref, 'refs/tags/v')) - && 'ubuntu-latest' == matrix.os + && 'ubuntu-24.04' == matrix.os uses: "actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02" with: name: "docs-html" diff --git a/.github/workflows/clp-execution-image-build.yaml b/.github/workflows/clp-execution-image-build.yaml index 17789906e8..dcc1edddab 100644 --- a/.github/workflows/clp-execution-image-build.yaml +++ b/.github/workflows/clp-execution-image-build.yaml @@ -24,7 +24,8 @@ concurrency: jobs: filter-relevant-changes: name: "filter-relevant-changes" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" outputs: ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" steps: @@ -51,7 +52,8 @@ jobs: name: "ubuntu-jammy-execution-image" if: "'true' == needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed" needs: "filter-relevant-changes" - runs-on: "ubuntu-latest" + runs-on: + - "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: diff --git a/.github/workflows/clp-lint.yaml b/.github/workflows/clp-lint.yaml index 5f800d8c23..ba5eed50e6 100644 --- a/.github/workflows/clp-lint.yaml +++ b/.github/workflows/clp-lint.yaml @@ -18,7 +18,9 @@ jobs: name: "lint-check" strategy: matrix: - os: ["macos-latest", "ubuntu-latest"] + os: + - "macos-15" + - "ubuntu-24.04" runs-on: "${{matrix.os}}" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" @@ -33,7 +35,7 @@ jobs: shell: "bash" run: "npm install -g @go-task/cli" - - if: "matrix.os == 'macos-latest'" + - if: "matrix.os == 'macos-15'" name: "Install coreutils (for md5sum)" run: "brew install coreutils" diff --git a/.github/workflows/clp-s-generated-code-checks.yaml b/.github/workflows/clp-s-generated-code-checks.yaml index e605db9005..887afa6b5d 100644 --- a/.github/workflows/clp-s-generated-code-checks.yaml +++ b/.github/workflows/clp-s-generated-code-checks.yaml @@ -15,7 +15,9 @@ jobs: name: "antlr-code-committed" strategy: matrix: - os: ["macos-latest", "ubuntu-latest"] + os: + - "macos-15" + - "ubuntu-24.04" runs-on: "${{matrix.os}}" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" @@ -26,7 +28,7 @@ jobs: shell: "bash" run: "npm install -g @go-task/cli" - - if: "matrix.os == 'macos-latest'" + - if: "matrix.os == 'macos-15'" name: "Install coreutils (for md5sum)" run: "brew install coreutils" From d39e0778b70efa5e3d9479fbb11b8fe7c7c8a348 Mon Sep 17 00:00:00 2001 From: davidlion Date: Fri, 25 Jul 2025 18:58:13 -0400 Subject: [PATCH 2/3] Runs-on is weird. --- .github/workflows/clp-core-build.yaml | 21 +++++++------------ .../workflows/clp-execution-image-build.yaml | 6 ++---- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 4a9c611d61..93292ed311 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -42,8 +42,7 @@ concurrency: jobs: filter-relevant-changes: name: "filter-relevant-changes" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" outputs: centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}" ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" @@ -100,8 +99,7 @@ jobs: name: "centos-stream-9-deps-image" if: "needs.filter-relevant-changes.outputs.centos_stream_9_image_changed == 'true'" needs: "filter-relevant-changes" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -127,8 +125,7 @@ jobs: name: "ubuntu-jammy-deps-image" if: "needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed == 'true'" needs: "filter-relevant-changes" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -163,8 +160,7 @@ jobs: use_shared_libs: [true, false] name: "centos-stream-9-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" continue-on-error: true - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -209,8 +205,7 @@ jobs: OS_NAME: "ubuntu-jammy" name: "ubuntu-jammy-${{matrix.use_shared_libs == true && 'dynamic' || 'static'}}-linked-bins" continue-on-error: true - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: @@ -257,8 +252,7 @@ jobs: # Run if the ancestor jobs were successful/skipped and building clp was successful. if: "!cancelled() && !failure() && needs.ubuntu-jammy-binaries.result == 'success'" needs: "ubuntu-jammy-binaries" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" env: OS_NAME: "ubuntu-jammy" TMP_OUTPUT_DIR: "/tmp" @@ -325,8 +319,7 @@ jobs: needs: - "filter-relevant-changes" - "ubuntu-jammy-deps-image" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: diff --git a/.github/workflows/clp-execution-image-build.yaml b/.github/workflows/clp-execution-image-build.yaml index dcc1edddab..c2af595c0f 100644 --- a/.github/workflows/clp-execution-image-build.yaml +++ b/.github/workflows/clp-execution-image-build.yaml @@ -24,8 +24,7 @@ concurrency: jobs: filter-relevant-changes: name: "filter-relevant-changes" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" outputs: ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}" steps: @@ -52,8 +51,7 @@ jobs: name: "ubuntu-jammy-execution-image" if: "'true' == needs.filter-relevant-changes.outputs.ubuntu_jammy_image_changed" needs: "filter-relevant-changes" - runs-on: - - "ubuntu-24.04" + runs-on: "ubuntu-24.04" steps: - uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" with: From f9c35acc1df5c6de4febe62a4c1590d14044bf8b Mon Sep 17 00:00:00 2001 From: davidlion Date: Mon, 28 Jul 2025 01:35:32 -0400 Subject: [PATCH 3/3] Sucks to suck. --- .github/workflows/clp-pr-title-checks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clp-pr-title-checks.yaml b/.github/workflows/clp-pr-title-checks.yaml index 0aa1533a98..6aed037a92 100644 --- a/.github/workflows/clp-pr-title-checks.yaml +++ b/.github/workflows/clp-pr-title-checks.yaml @@ -24,7 +24,7 @@ jobs: permissions: # For amannn/action-semantic-pull-request pull-requests: "read" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" steps: - uses: "amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017" env: