Skip to content

[ci] Trigger full project matrix on ci-env/action.yml changes - #8249

Merged
tony-davis merged 10 commits into
developfrom
users/tony-davis/configure-ci-trigger-ci-env
Jun 25, 2026
Merged

tony-davis merged 10 commits into
developfrom
users/tony-davis/configure-ci-trigger-ci-env

Conversation

@tony-davis

Copy link
Copy Markdown
Contributor

Summary

The TheRock commit pin is centralized in .github/actions/ci-env/action.yml (the single source of truth introduced by #7262). But therock_configure_ci.py only treated .github/workflows/ and .github/scripts/ changes as CI-relevant, so a ref bump that edits only ci-env/action.yml wasn't detected as CI-relevant — meaning it didn't trigger the full build/test matrix that validates the new ref (only the basic checks ran).

This teaches is_path_workflow_file_related_to_ci to also treat .github/actions/ci-env/action.yml as CI-relevant, so centralized TheRock ref bumps exercise the full project matrix again.

Changes

  • .github/scripts/therock_configure_ci.py: add GITHUB_ACTIONS_CI_PATTERNS = ["ci-env/action.yml"] and a .github/actions/ clause to is_path_workflow_file_related_to_ci. (The .github/workflows/ + .github/scripts/ checks are refactored into a single prefix loop — behaviorally identical.)
  • .github/scripts/tests/therock_configure_ci_test.py: extend test_is_path_workflow_file_related_to_ci to assert ci-env/action.yml is CI-relevant and that an unrelated action path (setup-rocm-linux/action.yml) is not.

Background

This is the one still-needed piece carved out of the now-closed #8014 (a TheRock ref bump that was overcome by events once #8196 bumped develop directly). The bump portion of #8014 is obsolete, but this trigger fix is not yet on develop.

Test plan

  • is_path_workflow_file_related_to_ci unit test updated (syntax-checked locally; full suite runs in CI).
  • Confirm a subsequent ci-env-only ref bump triggers the full matrix.

The TheRock ref is centralized in .github/actions/ci-env/action.yml (the
single source of truth from #7262), but therock_configure_ci.py only
treated .github/workflows/ and .github/scripts/ changes as CI-relevant.
As a result, a ref bump that edits only ci-env/action.yml did not trigger
the full build/test matrix that validates it. Add .github/actions/ci-env/
as a CI-relevant path so centralized ref bumps exercise CI.
@tony-davis
tony-davis requested a review from a team as a code owner June 9, 2026 18:47
Copilot AI review requested due to automatic review settings June 9, 2026 18:47
@github-actions github-actions Bot added github actions project: none Does not target any component labels Jun 9, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Updates CI-change detection so that edits to the centralized CI environment composite action (.github/actions/ci-env/action.yml) are treated as CI-relevant, ensuring TheRock ref-only bumps trigger the full project build/test matrix again.

Changes:

  • Teach is_path_workflow_file_related_to_ci() to consider .github/actions/ci-env/action.yml CI-relevant (while preserving existing workflow/script behavior).
  • Add a unit test covering the new ci-env/action.yml behavior and a negative test for an unrelated action path.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
.github/scripts/therock_configure_ci.py Extend CI-related path matching to include .github/actions/ci-env/action.yml.
.github/scripts/tests/therock_configure_ci_test.py Add assertions verifying ci-env/action.yml is CI-relevant and unrelated actions are not.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@geomin12 geomin12 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

lgtm but pre-commit is failing

Collapse the redundant parentheses around pr_labels_json into a single line so the pre-commit black hook passes.

Co-authored-by: Cursor <cursoragent@cursor.com>
@tony-davis
tony-davis enabled auto-merge (squash) June 15, 2026 21:22

@davidd-amd davidd-amd left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks ok to me just curious why we have the two different action.yml files.

@tony-davis

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

auto-merge was automatically disabled June 17, 2026 14:25

Head branch was pushed to by a user without write access

Copilot AI commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved by merging develop and fixing the conflict in .github/scripts/therock_configure_ci.py while preserving the ci-env/action.yml CI-trigger logic. Commit: 14267647.

Copilot's merge commit left only one blank line before
is_path_workflow_file_related_to_ci; black requires two. Add the
missing blank line so the pre-commit black hook passes.

Co-authored-by: Cursor <cursoragent@cursor.com>
@tony-davis
tony-davis enabled auto-merge (squash) June 17, 2026 17:53
Comment thread .github/scripts/therock_configure_ci.py Resolved
Comment thread .github/scripts/therock_configure_ci.py Resolved
@archana-ramalingam

Copy link
Copy Markdown
Contributor

@tony-davis ROCm/TheRock#5620 merged today — the bot now creates bump PRs that only touch ci-env/action.yml.
Without this PR #8249, bump PRs will only touch ci-env/action.yml & won't trigger the full build/test matrix and could merge with incomplete CI.

tony-davis and others added 3 commits June 24, 2026 16:33
Per review feedback, the test-only is_path_workflow_file_related_to_ci
duplicated check_for_workflow_file_related_to_ci. Drop it and have the
test exercise the production function directly.
Co-authored-by: Cursor <cursoragent@cursor.com>
@tony-davis
tony-davis merged commit 6a57a44 into develop Jun 25, 2026
86 checks passed
@tony-davis
tony-davis deleted the users/tony-davis/configure-ci-trigger-ci-env branch June 25, 2026 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants