Skip to content

CI: Query base.ref instead of sha for milestone VERSION resolution #7463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArthPatel1502 wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −1
Open

CI: Query base.ref instead of sha for milestone VERSION resolution #7463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion .github/workflows/milestones.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
gh api \
-H "Accept: application/vnd.github.raw" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/{owner}/{repo}/contents/include/VERSION?ref=${{ github.sha }}"
"/repos/{owner}/{repo}/contents/include/VERSION?ref=${{ github.event.pull_request.base.ref }}"
Copy link
Copy Markdown
Member

@echoix echoix Jun 1, 2026

Choose a reason for hiding this comment

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

What about merge_commit_sha in https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=closed#pull_request

In https://docs.github.com/en/rest/pulls/pulls?apiVersion=2026-03-10#get-a-pull-request, it shows that if the PR is merged (which is what is checked on line 13, then it is a sha (so less user-controllable).

Suggested change
"/repos/{owner}/{repo}/contents/include/VERSION?ref=${{ github.event.pull_request.base.ref }}"
"/repos/{owner}/{repo}/contents/include/VERSION?ref=${{ github.event.pull_request. merge_commit_sha }}"

It might still be needed to change into an env var to not evaluate the template directly for zizmor checks to be happy (which is a good thing).

Copy link
Copy Markdown
Contributor Author

@ArthPatel1502 ArthPatel1502 Jun 2, 2026

Choose a reason for hiding this comment

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

Thanks for the great catch and the security tip, @echoix! That makes total sense. I've updated the workflow to use merge_commit_sha and safely mapped it to an environment variable to keep zizmor happy. Appreciate the feedback!

echo "EOF"
} >> "${GITHUB_OUTPUT}"
env:
Expand Down
Loading