-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[vcpkg.cmake] guard against inf recursion. #23195
Conversation
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 is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 6b3147e..165fa5e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7542,7 +7542,7 @@
},
"zlib": {
"baseline": "1.2.11",
- "port-version": 13
+ "port-version": 14
},
"zlib-ng": {
"baseline": "2.0.5",
diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json
index 7c0d68f..cc5ac06 100644
--- a/versions/z-/zlib.json
+++ b/versions/z-/zlib.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "6e9612a1beb3167f554ef45373ab272b56596f90",
+ "version": "1.2.11",
+ "port-version": 14
+ },
{
"git-tree": "92cfe30c807d343c6359d272242f0765ad906740",
"version": "1.2.11",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/zlib/vcpkg.json
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
Co-authored-by: autoantwort <[email protected]>
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 is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 6b3147e..165fa5e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7542,7 +7542,7 @@
},
"zlib": {
"baseline": "1.2.11",
- "port-version": 13
+ "port-version": 14
},
"zlib-ng": {
"baseline": "2.0.5",
diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json
index 7c0d68f..f0f409f 100644
--- a/versions/z-/zlib.json
+++ b/versions/z-/zlib.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "27564e1e248f9c40b856871f6b112eb4c4971dc1",
+ "version": "1.2.11",
+ "port-version": 14
+ },
{
"git-tree": "92cfe30c807d343c6359d272242f0765ad906740",
"version": "1.2.11",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
@JackBoosY: Why the tag |
Ah sorry for that. Now we use cmake 3.22. |
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.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
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.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
Hmm the license bot is buggy for test ports |
Ready for review now? |
@JackBoosY Yes |
I'd like this PR and we should wait for other team members to review it. |
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 need to review further, but that's the obvious change I see right now.
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.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
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.
Those are the only two things, then I'm approve (well, also have a vcpkg_underlying_add_executable
and such)
Co-authored-by: nicole mazzuca <[email protected]>
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.
You have modified or added at least one vcpkg.json where you should check the license
field.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
3ed937b
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.
You have modified or added at least one vcpkg.json where you should check the license
field.
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/inf-recursion-test/vcpkg.json
Valid values for the license field can be found in the documentation
So what's the status here? |
@JackBoosY Should be finished. The zlib issue seems to be gone since CI is green (?, never had a clue why it was happening any way and wasn't locally reproduciable) |
@BillyONeal Can you please review again? Thanks. |
I see the merge conflict; I ignore the merge conflict unless somebody is showing a willingness to merge. or should I invent a new 3.24 toolchain ? |
We should not do this: defending against the "before project()" case when all in-the-wild examples have been after project() seems like unnecessary complexity. |
Do you have a list of examples? The point here is also that for those examples we could patch them to be before |
The ones listed in the rationale for the change (e.g. #16454) are that way. |
Given that this change is complex and we haven't seen an in the wild example it will fix, I'm going to close this. Please feel to reopen it should an in the wild bug it would fix appears. Thanks for your contribution! |
@BillyONeal You still want to have z_vcpkg_underlying_find_package to someday support dependency providers. You want wrappers to stop using |
@BillyONeal: Just saying: The overrides in It should be a priority to get rid of the plain |
@JavierMatosD @ras0219-msft @vicroms @AugP and I discussed. We make the following observations:
|
That variable is currently broken and correctly supporting it requires
Seems like a hen/egg problem. First requires the proper infrastructure in vcpkg.cmake and then can add the post build check into vcpkg-tool otherwise there is no way to fix the CI issues appearing due to the post build check. |
requires cmake 3.18
closes #16454