[vcpkg-ci] Request conversion of CONTROL files#19698
[vcpkg-ci] Request conversion of CONTROL files#19698BillyONeal merged 1 commit intomicrosoft:masterfrom
Conversation
There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",Wird er überhaupt direkt verwendet?
c4b38c5 to
ef0b546
Compare
There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",You have modified at least one CONTROL file, please consider converting them to vcpkg.json files
./vcpkg format-manifest HEAD detached at pull/19698/merge
Untracked files:
(use "git add <file>..." to include in what will be committed)
.github-pr.format-CONTROL
pr/
nothing added to commit but untracked files present (use "git add" to track)There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",You have modified at least one CONTROL file, please consider converting them to vcpkg.json files
Diff
* 9ac883f (HEAD, pull/19698/merge) Merge 8c6cc24fd5e526b2e760f71a8ded3e4b02fc4c72 into 025e564979cc01d0fbc5c920aa8a36635efb01bb
|\
| * 8c6cc24 (grafted) debug
* 025e564 (grafted) [vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 (#19633)There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",You have modified at least one CONTROL file, please consider converting them to vcpkg.json files
Diff
* d0865bf (HEAD, pull/19698/merge) Merge 34a6f106951d188b2669344c0e6f04f3635288d0 into 025e564979cc01d0fbc5c920aa8a36635efb01bb
|\
| * 34a6f10 debug
| * 8c6cc24 debug
| * ec07678 debug
| * ef0b546 TEST: change control files
| * 8e2d2c0 [vcpkg-ci] Request conversion of CONTROL files
|/
* 025e564 [vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 (#19633)
* 6aa310a [freebds] Fix vcpkg-tool compilation issue (#19641)
* ab60f27 [kf5windowsystem] fix cmake.in for static usage; extra fixes (#19440)
* 996baef [wxwidgets] make wxUSE_STL an optional triplet feature (#19274)
* bd7fc2c [libconfig] fix compilation errors on macos (#19374)
* 27d8b29 [abseil] Upgrade to 20210324.2 (#19357)
* a9613b5 [angle] Fix mingw build (#19307)
* 25382e3 [sdl2] Update to 2.0.16 (#19509)
* c721ff6 [lua] Add error message to feature `cpp` when building uwp (#19510)
* f0da48d [immer] update port (#19521)
* bfc9927 [opentelemetry-cpp] New port (#19536)
* 322e3e1 [zug] Add port (#19539)
* 719ceca [vamp-sdk] update to 2.10; switch download URL to GitHub; fix path of installed headers (#19572)
* 3fee81c [bshoshany-thread-pool] Updated to v2.0.0 (#19582)34a6f10 to
ee2db67
Compare
There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",There was a problem hiding this comment.
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 025e564979cc01d0fbc5c920aa8a36635efb01bb -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cd4e9..ed062bb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,7 +6769,7 @@
"port-version": 0
},
"wt": {
- "baseline": "4.5.0",
+ "baseline": "4.5.1",
"port-version": 0
},
"wtl": {
@@ -6817,7 +6817,7 @@
"port-version": 0
},
"xframe": {
- "baseline": "0.3.0",
+ "baseline": "0.3.1",
"port-version": 0
},
"xlnt": {
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index 6a42741..1d98af3 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "5f2e40529b1daae7ab73d397a80b337691c4e9e2",
+ "version-string": "4.5.1",
+ "port-version": 0
+ },
{
"git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546",
"version-string": "4.5.0",
diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json
index 36c8646..63fd5f4 100644
--- a/versions/x-/xframe.json
+++ b/versions/x-/xframe.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "f145785fb9a593553f8dae7f1447051a212444a0",
+ "version-string": "0.3.1",
+ "port-version": 0
+ },
{
"git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525",
"version-string": "0.3.0",You have modified at least one CONTROL file, please consider converting them to vcpkg.json files
./vcpkg format-manifest ports/wt/CONTROL ports/xframe/CONTROL1684a79 to
8e1ada6
Compare
8e1ada6 to
3fef77e
Compare
|
Overall this looks great to me; I need to sit down and review the specific git command pipeline before merging but I don't expect any further work needed. |
|
Should we consider just bulk doing this instead of asking contributors to do it? |
I would prefer this, but it seemed like there was no consensus on this. |
Maybe it could be done with the next internal CMake update. This will invalidate all binary caches any way. |
|
|
Do we still want this now that #19986 is merged? |
|
Hm yeah maybe when someone wants to add an CONTROL file one would get this message. |
|
Can we not remove a bunch of the git merge complexity, given that any CONTROL files are now a problem? |
|
Yeah we could change |
You can also avoid all the git stuff (in particular, trying to fetch more history) since any remaining CONTROL is doom |
Yeah. But I wanted to create another PR where I search for |
I'm not sure how I feel about this one. It is a thing that would be nice for contributors to do, but I don't think someone showing up just to bump a version number should be obligated to do it. (It made sense to require folks to update from CONTROL because it was "run this command and that's it" level of investment with us) Upstream contributors don't want to have to learn the ins and outs of whatever our current best practices are, they just want to make their current version available and get on with their life. Putting it in this check would mark the PR as "request changes" so I'm not sure it's appropriate, although it could be if it's reduced to just a comment "consider adopting vcpkg_cmake_Xxx" or similar. |
|
(For what it's worth I don't know if my opinion on not requiring contributors to make such changes is shared by the other maintainers) |
|
We can choose a neutral message like |
Sure. OK so to land this I think we need at least #19698 (comment) I would feel better if the detection was also changed to just look for any control files rather than edited ones, but I wouldn't block merging this PR over it. |
c07e971 to
737a4c7
Compare
|
@BillyONeal I have created #20142 for the deprecated cmake functions |
|
Thanks for the additional helpful text for contributors! |
They are often not updated. After this PR this will be requested automatically.