Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/clp-core-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ jobs:
strategy:
matrix:
os:
- "macos-13"
- "macos-14"
- "macos-15"
use_shared_libs:
- true
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/clp-core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ concurrency:
jobs:
filter-relevant-changes:
name: "filter-relevant-changes"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04"
outputs:
Comment on lines +45 to 46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Deduplicate runner specification with YAML anchors or defaults

"ubuntu-24.04" is hard-coded in seven jobs. Using a YAML anchor/alias or defaults.runs-on reduces repetition and makes future upgrades a one-liner, e.g.:

x-ubuntu-runner: &ubuntu-runner "ubuntu-24.04"

jobs:
  filter-relevant-changes:
    runs-on: *ubuntu-runner

Also applies to: 102-103, 128-129, 163-164, 208-209, 255-256, 322-323

🤖 Prompt for AI Agents
In .github/workflows/clp-core-build.yaml around lines 45 to 46 and other
specified locations, the runner "ubuntu-24.04" is repeated in multiple jobs. To
fix this, define a YAML anchor for the runner label at the top of the file, for
example, x-ubuntu-runner: &ubuntu-runner "ubuntu-24.04", and then replace all
hard-coded runner values with the alias *ubuntu-runner. This reduces duplication
and simplifies future updates.

centos_stream_9_image_changed: "${{steps.filter.outputs.centos_stream_9_image}}"
ubuntu_jammy_image_changed: "${{steps.filter.outputs.ubuntu_jammy_image}}"
Expand Down Expand Up @@ -99,7 +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-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand All @@ -125,7 +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-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand Down Expand Up @@ -160,7 +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-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand Down Expand Up @@ -205,7 +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-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand Down Expand Up @@ -252,7 +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-latest"
runs-on: "ubuntu-24.04"
env:
OS_NAME: "ubuntu-jammy"
TMP_OUTPUT_DIR: "/tmp"
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
needs:
- "filter-relevant-changes"
- "ubuntu-jammy-deps-image"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/clp-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
name: "build"
strategy:
matrix:
os: ["macos-latest", "ubuntu-latest"]
os:
- "macos-15"
- "ubuntu-24.04"
runs-on: "${{matrix.os}}"
Comment on lines +21 to 24
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Upload condition tied to hard-coded runner string

Good call making runner versions explicit.
The artefact-upload step now uses

&& 'ubuntu-24.04' == matrix.os

A future bump to 26.04 would silently skip uploads. Consider introducing a boolean like is_primary_linux (set in the matrix) or comparing startsWith(matrix.os, 'ubuntu-') to reduce churn.

Also applies to: 39-41, 51-51

🤖 Prompt for AI Agents
In .github/workflows/clp-docs.yaml around lines 21 to 24, the upload condition
uses a hard-coded runner string 'ubuntu-24.04', which will break if the version
changes. To fix this, modify the matrix to include a boolean flag like
is_primary_linux for the primary Linux runner or change the condition to check
if matrix.os starts with 'ubuntu-' using a startsWith function. Apply similar
changes to lines 39-41 and 51 to avoid silent skips on future version bumps.

steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
Expand All @@ -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"

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clp-execution-image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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:
Expand All @@ -51,7 +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-latest"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/clp-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/clp-s-generated-code-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
Loading