Skip to content
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.

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

Use ports-root and registry-versions git repos. #1241

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

BillyONeal
Copy link
Member

Use the git repo of --x-builtin-ports-root and --x-builtin-registry-versions-dir when talking about port commit shas and version tree shas, respectively.

I believe this is necessary to make the instructions in https://learn.microsoft.com/vcpkg/produce/publish-to-a-git-registry#4---update-the-versions-database actually work.

This also reduces the number of things that assume VCPKG_ROOT is a git repo. (Since it is not when we are shipped in VS or acquired with the one liner)

Another extraction from #1210 .

…ersions-dir when talking about port commit shas and version tree shas, respectively.

I believe this is necessary to make the instructions in https://learn.microsoft.com/vcpkg/produce/publish-to-a-git-registry#4---update-the-versions-database actually work.

This also reduces the number of things that assume VCPKG_ROOT is a git repo. (Since it is not when we are shipped in VS or acquired with the one liner)
Copy link
Member

@vicroms vicroms left a comment

Choose a reason for hiding this comment

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

The current instructions worked for x-add-version because the calculated SHAs are the same regardless of the parent repository. But this change could let us to run x-ci-verify-versions on the registry.

@BillyONeal
Copy link
Member Author

The current instructions worked for x-add-version because the calculated SHAs are the same regardless of the parent repository.

x-add-version depends on ls-tree doing the right thing, and I don't believe it does so in the wrong repo. It certainly doesn't do the right thing for one-liner and VS copy of vcpkg, where vcpkg_root isn't a git repo at all.

But this change could let us to run x-ci-verify-versions on the registry.

Indeed this is why I made the change in #1210 :)

@BillyONeal BillyONeal merged commit 43c47e8 into microsoft:main Oct 24, 2023
5 checks passed
@BillyONeal BillyONeal deleted the use-correct-git-repos branch October 24, 2023 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants