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

Teach x-ci-verify-versions to check that versions exist in the database #1210

Merged
merged 68 commits into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
e7a6683
Make registries distinguish between 'baseline is broken' and 'baselin…
BillyONeal Aug 12, 2023
09e135c
Fix move on constant variable.
BillyONeal Aug 15, 2023
4d8ca9e
Fix merge conflict error.
BillyONeal Sep 19, 2023
ac43653
Merge remote-tracking branch 'origin/main' into clarify-no-baseline-v…
BillyONeal Sep 20, 2023
21bb633
Substantially overhaul how x-ci-verify-versions works:
BillyONeal Sep 21, 2023
a741b84
Teach vcpkg to find bogus version constraints and overrides that are …
BillyONeal Sep 23, 2023
d9dcaae
Clarify that source_location is path to CONTROL, not port_directory.
BillyONeal Sep 26, 2023
1e9673c
Fix e2e test failures by also making JSON parse errors print the file…
BillyONeal Sep 27, 2023
40bdceb
Fix output claiming that a port isn't in the versions database when i…
BillyONeal Sep 27, 2023
7b3682f
oops
BillyONeal Sep 27, 2023
13a30de
oops2
BillyONeal Sep 27, 2023
8dd6ad8
Try to workaround macos compile failure by just not providing copy op…
BillyONeal Sep 27, 2023
9ad36ac
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Sep 27, 2023
b094ab1
Get rid of one more CONTROL/vcpkg.json tester by using git_checkout_p…
BillyONeal Sep 27, 2023
58452c1
Print success and failure messages at the same time and deduplicate g…
BillyONeal Sep 27, 2023
dac383c
Add comment explaining funny output.
BillyONeal Sep 27, 2023
8786bab
Deduplicate 'failed to load port' message.
BillyONeal Sep 28, 2023
de7428c
Add a notice of which version we are loading back.
BillyONeal Sep 28, 2023
68122ce
Fix crash while parsing malformed manifest files.
BillyONeal Sep 28, 2023
b04a5b2
Remove semantic constraints on the deserialized type and add specific…
BillyONeal Sep 29, 2023
43c98e5
Merge remote-tracking branch 'origin/main' into clarify-no-baseline-v…
BillyONeal Sep 29, 2023
38f738d
Code review feedback
BillyONeal Sep 29, 2023
80fa913
Make the e2e tests into unit tests and make the errors a bit prettier.
BillyONeal Sep 29, 2023
918269b
Burninate Expr::Empty
BillyONeal Sep 29, 2023
7f9ac40
Merge remote-tracking branch 'origin/main' into add-error-for-bad-dep…
BillyONeal Sep 30, 2023
582382f
Code review feedback
BillyONeal Sep 30, 2023
09cbd98
Merge branch 'clarify-no-baseline-vs-error' into version-verification
BillyONeal Sep 30, 2023
580244c
Merge branch 'add-error-for-bad-dependency-features' into version-ver…
BillyONeal Sep 30, 2023
b2a6334
Fix merge conflicts
BillyONeal Sep 30, 2023
ae5300b
Restore spdx_location.
BillyONeal Sep 30, 2023
e2f38d8
Add end to end tests and make errors more pretty.
BillyONeal Sep 30, 2023
cdcbfb5
Tolerate no user.name etc.
BillyONeal Sep 30, 2023
5c26031
Fix registries test that tried to set --x-builtin-registry-versions-d…
BillyONeal Sep 30, 2023
fd4e9c4
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Oct 2, 2023
c77b92b
Also fix broken versions e2e tests.
BillyONeal Oct 2, 2023
89e216e
Attempt better *nix defenses
BillyONeal Oct 2, 2023
78c4aaf
Try to sanitize whitespace
BillyONeal Oct 2, 2023
0dd96ee
clang-format
BillyONeal Oct 2, 2023
ede9734
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Oct 10, 2023
70e914b
Collapse out a few more maybe_maybes and respond to comments of https…
BillyONeal Oct 10, 2023
57340d0
Reduce join() code size after discussion with @JavierMatosD
BillyONeal Oct 10, 2023
251334b
Fix macos error and use lookup_in_maybe_baseline in one more place.
BillyONeal Oct 10, 2023
d5e4042
Fix output nitpicks
BillyONeal Oct 10, 2023
95936ec
Change all errors to always print paths at the beginning of a line
BillyONeal Oct 10, 2023
1cfa496
Fixed 2 missing then patterns
BillyONeal Oct 10, 2023
f7a9589
Add diff output on test failure
BillyONeal Oct 10, 2023
392a47c
Try to fix linux and macos diffing
BillyONeal Oct 10, 2023
6a7bbd2
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Oct 10, 2023
afdbeea
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Oct 18, 2023
903cb74
Ensure spdx_location is not dropped when loading ports.
BillyONeal Oct 18, 2023
a4b7fa1
Use SchemedVersion in DependencyOverride rather than reinventing it.
BillyONeal Oct 18, 2023
db17508
Back off to Version given that the scheme is not significant to overr…
BillyONeal Oct 19, 2023
36b33a2
Merge remote-tracking branch 'BillyONeal/use-schemed-version' into ve…
BillyONeal Oct 20, 2023
2291b0a
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Oct 24, 2023
dc0110e
Merge remote-tracking branch 'origin/main' into spdx_location
BillyONeal Oct 26, 2023
a18997b
Persist the correct path.
BillyONeal Oct 26, 2023
6e794ec
Code review feedback from 2023-10-26.
BillyONeal Oct 28, 2023
a922e76
Merge remote-tracking branch 'origin/main' into spdx_location
BillyONeal Nov 4, 2023
4434e81
Merge remote-tracking branch 'origin/main' into spdx_location
BillyONeal Nov 7, 2023
b70ddbe
Merge branch 'spdx_location' into version-verification
BillyONeal Nov 7, 2023
570d2f3
Merge gore. Not sure if I want to keep format-manifest changes lookin…
BillyONeal Nov 7, 2023
b195ca2
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Nov 10, 2023
696c90d
Merge gore
BillyONeal Nov 10, 2023
f38ed65
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Nov 16, 2023
d3d53c9
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Jun 7, 2024
fa86593
Revert the `ReaderMessage` part of the change which became https://gi…
BillyONeal Jun 7, 2024
3d2f9b0
Remove unused messages.
BillyONeal Jun 7, 2024
c2e82e5
Merge remote-tracking branch 'origin/main' into version-verification
BillyONeal Jun 21, 2024
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* -text
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-git-tree",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-history-name-is-bad",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "has-local-edits",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "malformed",
"version": "1.0",
~broken
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "mismatch-git-tree",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-missing",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-scheme-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-git-tree",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-history-name",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-mismatch",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-missing",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "dependency-not-in-versions-database-feature",
"version": "1.0",
"features": {
"add-things": {
"description": "an example feature that adds some things",
"dependencies": [
"no-versions"
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "dependency-not-in-versions-database",
"version": "1.0",
"dependencies": [
"no-versions"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "dependency-version-not-in-versions-database-feature",
"version": "1.0",
"features": {
"add-things": {
"description": "an example feature that adds some things",
"dependencies": [
{
"name": "good",
"version>=": "0.9"
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "dependency-version-not-in-versions-database",
"version": "1.0",
"dependencies": [
{
"name": "good",
"version>=": "0.9"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "good",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "malformed",
"version": "1.1",
~broken
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$comment": "This comment changes the correct git-tree without changing the version",
"name": "mismatch-git-tree",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "no-versions",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "override-not-in-versions-database",
"version": "1.0",
"overrides": [
{
"name": "no-versions",
"version": "1.0"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "override-version-not-in-versions-database",
"version": "1.0",
"overrides": [
{
"name": "good",
"version": "0.9"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-mismatch",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-missing",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-scheme-mismatch",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"versions": [
{
"git-tree": "000000070c5f496fcf1a97cf654d5e81f0d2685a",
"version": "1.1",
"port-version": 0
},
{
"git-tree": "00000005fb6b76058ce09252f521847363c6b266",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"versions": [
{
"git-tree": "f34f4ad3dfcc4d46d467d7b6aa04f9732a7951d6",
"version": "1.1",
"port-version": 0
},
{
"git-tree": "db9d98300e7daeb2c0652bae94a0283a1b1a13d1",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"versions": [
{
"git-tree": "cf8a1faa9f94f7ceb9513d65093d407e11ac1402",
"version": "1.1",
"port-version": 0
},
{
"git-tree": "a6d7dde2f5a9ea80db16c7f73c43556a7e21e5cf",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "a5c21769008f52ed66afa344f13b786dde4b8d7d",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"default": {
"bad-git-tree": {
"baseline": "1.1",
"port-version": 0
},
"bad-history-name": {
"baseline": "1.1",
"port-version": 0
},
"baseline-version-mismatch": {
"baseline": "1.0",
"port-version": 0
},
"dependency-not-in-versions-database": {
"baseline": "1.0",
"port-version": 0
},
"dependency-not-in-versions-database-feature": {
"baseline": "1.0",
"port-version": 0
},
"dependency-version-not-in-versions-database": {
"baseline": "1.0",
"port-version": 0
},
"dependency-version-not-in-versions-database-feature": {
"baseline": "1.0",
"port-version": 0
},
"empty-versions": {
"baseline": "1.0",
"port-version": 0
},
"good": {
"baseline": "1.0",
"port-version": 0
},
"has-local-edits": {
"baseline": "1.0.0",
"port-version": 0
},
"malformed": {
"baseline": "1.0",
"port-version": 0
},
"mismatch-git-tree": {
"baseline": "1.0",
"port-version": 0
},
"no-versions": {
"baseline": "1.0",
"port-version": 0
},
"override-not-in-versions-database": {
"baseline": "1.0",
"port-version": 0
},
"override-version-not-in-versions-database": {
"baseline": "1.0",
"port-version": 0
},
"version-mismatch": {
"baseline": "1.1",
"port-version": 0
},
"version-missing": {
"baseline": "1.1",
"port-version": 0
},
"version-scheme-mismatch": {
"baseline": "1.1",
"port-version": 0
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "2298ee25ea54ed92595250a2be07d01bdd76f47c",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "321c8b400526dc412a987285ef469eec6221a4b4",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "ba3008bb2d42c61f172b7d9592de0212edf20fc6",
"version": "1.0",
"port-version": 0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "f0d44555fe7714929e432ab9e12a436e28ffef9e",
"version": "1.0",
"port-version": 0
}
]
}
Loading
Loading