-
Notifications
You must be signed in to change notification settings - Fork 300
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
Make x-add-version not require changes be committed first. #1616
Conversation
…ectory rather than the whole ports tree. Also extract some git ops to git.h.
Perf impact of not needing to SHA the whole ports directory as in 2cf695a : |
…preserve chmod +x which doesn't exist on the real filesystem.
…ions test. I made the registry database edits with 2025-03-13-7699e411ea11543de6abc0c7d5fd11cfe0039ae5 , so I know they aren't affected by my changes.
The effect of this change is reverted; it might be worth bringing back in the form of using a smaller set of |
@@ -2,14 +2,12 @@ | |||
|
|||
Copy-Item -Recurse "$PSScriptRoot/../e2e-assets/ci-verify-versions-registry" "$TestingRoot/ci-verify-versions-registry" | |||
git -C "$TestingRoot/ci-verify-versions-registry" @gitConfigOptions init | |||
git -C "$TestingRoot/ci-verify-versions-registry" @gitConfigOptions add --chmod=+x 'ports/executable-bit/some-script.sh' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This additional test was added with the change to reuse the existing index done in response to x-ci-verify-versions
failing on the real github.com/microsoft/vcpkg. Because I was always making new trees that don't have the git-only-on-Windows-anyway +x
bit, the new trees had different SHAs than our version database says, resulting in failures.
In the following message to the team I sent when I just discovered this problem I'm using git diff-tree
on some of the openssl trees and ports\openssl\unix\configure
shows up because it's got a +x
.
(Sorry it's just a screenshot; now that I fixed the problem it'd be annoying to try to recreate the broken behavior and it isn't super important now that it is fixed and has a regression test anyway)
e853eef
to
7fd1cd7
Compare
7fd1cd7
to
3b8092d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure this check is dead now but doesn't hurt anything to leave this I guess
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Some comments regarding the error messages, but not blocking over this.
I was trying to fix a bug / assumption that
builtin_ports_dir
is undervcpkg_root
elsewhere and realized it might be easier to just fix this problem for good. Note that we no longer need to know where the.git
is and the only real input is the target directory. Git finds the.git
directory if necessary; we want it to do that because it respects e.g.GIT_CEILING_DIRECTORIES
and friends.