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

[vcpkg-tools] update cmake and git (windows only) #22985

Merged
merged 29 commits into from
Feb 26, 2022

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Feb 7, 2022

Just update cmake to 3.22.2 and git on windows

supersedes #21456
depends #22998
depends #22846
depends #23010

I'll cleanup this PR when the dependent PRs have been merged.

Copy link

@github-actions github-actions bot left a 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 portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • scripts/test_ports/cmake/portfile.cmake

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/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 20297a59505785fd947bdab9aba6f68cb58a1cc4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 0449fca8..30c684e5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

@JackBoosY JackBoosY added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Feb 8, 2022
@JackBoosY
Copy link
Contributor

Related: #21456.

ports/qtbase/portfile.cmake Outdated Show resolved Hide resolved
@Neumann-A
Copy link
Contributor Author

hmm linux qtbase fails with:

ERROR: Feature "xkbcommon_x11": Forcing to "ON" breaks its condition:
    QT_FEATURE_xkbcommon AND XKB_COMMON_X11_FOUND
Condition values dump:
    QT_FEATURE_xkbcommon = "ON"
    XKB_COMMON_X11_FOUND = "0"

the search call is:
qt_find_package(XKB_COMMON_X11 0.5.0 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11 MODULE_NAME gui QMAKE_LIB xkbcommon_x11)
provision script has libxkbcommon-x11-dev so it should be installed.

pkg_check_modules(XKB_COMMON_X11 "xkbcommon-x11>=0.4.1" IMPORTED_TARGET)

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 84c41eb5cdc6cd22e24156bfb20dd53c8d358b98
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 942eb08c..8c7c835b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 84c41eb5cdc6cd22e24156bfb20dd53c8d358b98
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 942eb08c..8c7c835b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 98a04ddada263f37b0d54b2b7a91e89a31d9e123
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index def47df0..c9aaafb6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for pkgconf but no changes to version or port version.
-- Version: 1.8.0#1
-- Old SHA: cbcb5f984f7713a636caa075f06b755d37493dbd
-- New SHA: 6067a1f60a364d3971a37c6fc3adf77e6818228b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 98a04ddada263f37b0d54b2b7a91e89a31d9e123
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 71226c41..8bf4056c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

@Neumann-A
Copy link
Contributor Author

So the problem boils down that qt and hidapi uses pkgconf build by vcpkg which is not setup to find system dependencies which is why the pkg_search_module call is failing for bot of them.

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for pkgconf but no changes to version or port version.
-- Version: 1.8.0#1
-- Old SHA: cbcb5f984f7713a636caa075f06b755d37493dbd
-- New SHA: 92a54fb2b308f84196af58b43eaf109fcd5fa855
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 98a04ddada263f37b0d54b2b7a91e89a31d9e123
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 71226c41..8bf4056c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for pkgconf but no changes to version or port version.
-- Version: 1.8.0#1
-- Old SHA: cbcb5f984f7713a636caa075f06b755d37493dbd
-- New SHA: d3adbc2ecc4f326fae57c3b7272d3bf6c85e2c0e
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#2
-- Old SHA: 0829d67a63010fca7f587ca7370db716570aa969
-- New SHA: 83c47d2565b9eac8d50eead18de69a9ede56dac8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.2#4
-- Old SHA: 2362188815f81dd666df3eaee1d96a208c1a0838
-- New SHA: 98a04ddada263f37b0d54b2b7a91e89a31d9e123
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d2b22891a13123accac084b5feabfd0914f4e243 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 71226c41..8bf4056c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2830,7 +2830,7 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
index cc2527f2..76da1d7a 100644
--- a/versions/i-/ignition-transport4.json
+++ b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8833e4c80a8470845c939e35c9f21229eec9d73",
+      "version-string": "4.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
       "version-string": "4.0.0",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/qtbase/portfile.cmake

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/ignition-transport4/vcpkg.json
  • ports/ignition-transport9/vcpkg.json
  • ports/qtbase/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

# Conflicts:
#	ports/ignition-transport4/vcpkg.json
#	ports/pkgconf/portfile.cmake
#	ports/qtbase/portfile.cmake
Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for hidapi but no changes to version or port version.
-- Version: 0.11.2#1
-- Old SHA: 145fcc6e2c3aa564666793d494a6b90c1323e0ac
-- New SHA: d0b42fe75288041cc8640eed3ea7fd445554688b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for ignition-transport9 but no changes to version or port version.
-- Version: 9.0.0#3
-- Old SHA: abbc50866e79bb1566460eb88135358ed740268d
-- New SHA: 14c635dff6e19c0a5762ed26a3c8891b08998daf
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a34997af6c00d3e5711a4a75428c34a99a5f1c8b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 1286dcf5..cf5dd201 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5778,7 +5778,7 @@
     },
     "qtbase": {
       "baseline": "6.2.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.2.3",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 0549e7a1..84f631a6 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7542b217aab48590dd848aa279ada20eb14bb9aa",
+      "version": "6.2.3",
+      "port-version": 1
+    },
     {
       "git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b",
       "version": "6.2.3",

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/ignition-transport9/vcpkg.json
  • scripts/test_ports/cmake/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a 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/cmake/vcpkg.json

Valid values for the license field can be found in the documentation

@Neumann-A Neumann-A marked this pull request as ready for review February 24, 2022 20:26
@Neumann-A
Copy link
Contributor Author

Neumann-A commented Feb 25, 2022

failing:

  • qtinterfaceframework:arm64-windows due to taglib error
  • cspice:x64-uwp due to header conflict (baseline regression)

@BillyONeal
Copy link
Member

Thank youuuuuuu!

@BillyONeal BillyONeal merged commit 1b1ae50 into microsoft:master Feb 26, 2022
@Neumann-A Neumann-A deleted the cmake_update_3.22.2 branch February 26, 2022 06:55
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Feb 26, 2022
[vcpkg-tools] update cmake and git (windows only) (microsoft#22985)
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 27, 2022
* master: (57 commits)
  [vcpkg-tools] update cmake and git (windows only) (microsoft#22985)
  Update vcpkg tool to 2022-02-24. (microsoft#23162)
  [vcpkg baseline] Move cspice headers (microsoft#23272)
  Fixed inaccurate Chinese words (microsoft#23179)
  [vcpkg] Add fixed changelog generator. (microsoft#23255)
  [authentication.md] Add Jenkins section (microsoft#23226)
  [vcpkg] Meson osx sysroot (microsoft#21772)
  [pkgconf] enable search for system libs on linux (microsoft#23010)
  [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218)
  [lapack-reference] Update to 3.10 (microsoft#23228)
  [skia] Arm64 for skia on osx (microsoft#23222)
  [libfido2] Update to 1.10.0 (microsoft#23241)
  [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061)
  [libgpiod] Add new port. (microsoft#23221)
  [drogon] Update to 1.7.5 (microsoft#23227)
  [tinyexif] Remove from fail list. (microsoft#23163)
  [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618)
  [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235)
  [OpenCV] upgrade to v4.5.5 (microsoft#22801)
  [libcurl-simple-https] New port (microsoft#22917)
  ...
@JackBoosY
Copy link
Contributor

Wow, thanks!
Since this PR was merged, can we continue #17487 ?

@dg0yt
Copy link
Contributor

dg0yt commented Feb 28, 2022

Since this PR was merged, can we continue #17487 ?

Why continue pkg-config? There is pkgconf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants