Skip to content

Fix version database consistency check. #51408

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

Merged
BillyONeal merged 1 commit into from
Apr 27, 2026
Merged

Fix version database consistency check. #51408

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
17 changes: 14 additions & 3 deletions .github/workflows/untrustedPR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:

unset VCPKG_ROOT

synthetic_merge_ref=$(git branch --show-current || true)
synthetic_merge_commit=$(git rev-parse HEAD)
target_branch_commit=$(git rev-parse HEAD^1)
incoming_branch_commit=$(git rev-parse HEAD^2)
merge_base=$(git merge-base "$target_branch_commit" "$incoming_branch_commit")
Expand All @@ -47,21 +49,30 @@ jobs:
echo "$location$id"; \
done || true; \
done > .github-pr.deprecated-license
# check for formatting mistakes by rerunning format-manifest and format-feature-baseline as appropriate
git switch --detach "$incoming_branch_commit"
./vcpkg format-manifest --all --convert-control
./vcpkg format-feature-baseline scripts/ci.baseline.txt
./vcpkg format-feature-baseline scripts/ci.feature.baseline.txt
git diff > .github-pr.format-manifest
# commit those formatting changes to a temporary commit so they don't affect further validations below
git add -u
git commit -m "tmp" --allow-empty
# reset the version database to the state of the merge base, so that we can check that the PR only adds one version and doesn't modify any existing versions
git restore --source=$merge_base --staged --worktree -- versions
git clean -fd -- versions
./vcpkg x-add-version --all --skip-formatting-check | grep -E '^warning:|instead of "version-string"' | tee .github-pr.version-string.out || true
# check for version format errors separately by running x-add-version --all, recording problems it generates
./vcpkg x-add-version --all | grep -E '^warning:|instead of "version-string"' | tee .github-pr.version-string.out || true
Copy link
Copy Markdown
Member Author

@BillyONeal BillyONeal Apr 27, 2026

Choose a reason for hiding this comment

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

I got rid of --skip-formatting-check because it's unnecessary. We already ran format-manifest --all above.

# reset the version database again
git restore --source=$merge_base --staged --worktree -- versions
git clean -fd -- versions
./vcpkg x-add-version --all --skip-formatting-check --skip-version-format-check | tee .github-pr.x-add-version.out || true
# check that the PR only adds one version and doesn't modify any existing versions, ignoring any of the warnings recorded into .github-pr.version-string.out
./vcpkg x-add-version --all --skip-version-format-check | tee .github-pr.x-add-version.out || true
git add -A -- versions
git diff --cached "$incoming_branch_commit" -- versions > .github-pr.x-add-version.diff
git reset HEAD~ --hard # remove the "tmp" commit from above
# reset to the original state of the PR so that the rest of the checks run on the original changes of the PR, not including any of the formatting changes we made or any changes to the version database
if [ -n "$synthetic_merge_ref" ]; then git switch "$synthetic_merge_ref"; else git switch --detach "$synthetic_merge_commit"; fi
git reset --hard "$synthetic_merge_commit"

- name: Generate Reply
uses: actions/github-script@v8
Expand Down