Skip to content

fix(ci): use merge base in quick pipelines to detect changed problems#1994

Merged
BenWibking merged 4 commits into
developmentfrom
chong/claude/fix-quick-ci-merge-base
Jun 24, 2026
Merged

fix(ci): use merge base in quick pipelines to detect changed problems#1994
BenWibking merged 4 commits into
developmentfrom
chong/claude/fix-quick-ci-merge-base

Conversation

@chongchonghe

@chongchonghe chongchonghe commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Description

Fix the "Detect changed problems" step in the quick CI pipelines to diff against the merge base rather than the tip of the target branch.

Previously, git diff --name-only FETCH_HEAD HEAD compared the PR's HEAD to the current tip of development. Because most PRs branch off an older commit, any problem files merged into development after the branch point also appeared as "changed" — causing the quick pipeline to build and test far more problems than the PR actually touched. The fix fetches enough history (--deepen=100) and uses git merge-base FETCH_HEAD HEAD to find the true common ancestor, then diffs only from that point to HEAD.

Related issues

N/A

Checklist

Before this pull request can be reviewed, all of these tasks should be completed. Denote completed tasks with an x inside the square brackets [ ] in the Markdown source below:

  • I have added a description (see above).
  • I have added a link to any related issues (if applicable; see above).
  • I have read the Contributing Guide.
  • I have added tests for any new physics that this PR adds to the code.
  • (For quokka-astro org members) I have manually triggered the GPU tests with the magic comment /azp run.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Note

Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported.

Previously, the quick pipelines compared HEAD to FETCH_HEAD (the current
tip of development), so any commits merged into development since the PR
branched off would appear as "changed" — causing more problems to be
built and tested than the PR actually touched.

Switch to git merge-base to find the common ancestor, then diff from
that point to HEAD, so only the PR's own changes are detected.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@chongchonghe chongchonghe marked this pull request as ready for review June 24, 2026 04:22
@dosubot dosubot Bot added size:XS This PR changes 0-9 lines, ignoring generated files. CI labels Jun 24, 2026
@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

🤖 Generated with Claude Code

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6db8dc1bdf

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .ci/azure-pipelines-quick.yml
@azure-pipelines

Copy link
Copy Markdown
No pipelines are associated with this pull request.

@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@chongchonghe chongchonghe marked this pull request as draft June 24, 2026 04:35
@chongchonghe

Copy link
Copy Markdown
Contributor Author

/azp run rocm-quick

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@chongchonghe chongchonghe marked this pull request as ready for review June 24, 2026 04:41
@dosubot dosubot Bot added the lgtm This PR has been approved by a maintainer label Jun 24, 2026
@BenWibking BenWibking enabled auto-merge June 24, 2026 12:51
@BenWibking BenWibking added this pull request to the merge queue Jun 24, 2026
Merged via the queue into development with commit eb0a0ae Jun 24, 2026
51 checks passed
@chongchonghe chongchonghe deleted the chong/claude/fix-quick-ci-merge-base branch June 25, 2026 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants