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 baseline] [Qt6] add FETCH_REF for qt modules without tag #21925

Merged
merged 6 commits into from
Dec 8, 2021

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Dec 8, 2021

Trying to fix CI errors

closes #21918

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 7bb175eafedb203f19b18cf211666ec728c7461a -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index d91e4e8..066a56c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5698,7 +5698,7 @@
     },
     "qtbase": {
       "baseline": "6.2.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.2.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index ce35abd..bae58a9 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a",
+      "version-semver": "6.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc",
       "version-semver": "6.2.2",

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 qtapplicationmanager but no changes to version or port version.
-- Version: 6.2.2
-- Old SHA: ca033ed7578b002c1ce195d879c622333231d159
-- New SHA: 6c760ebedac1a918ff3c02a24d826f390fed9f84
-- 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 7bb175eafedb203f19b18cf211666ec728c7461a -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 9624e79..d17d00b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4094,7 +4094,7 @@
     },
     "libyaml": {
       "baseline": "0.2.5",
-      "port-version": 2
+      "port-version": 3
     },
     "libyuv": {
       "baseline": "2021-04-15",
@@ -5698,7 +5698,7 @@
     },
     "qtbase": {
       "baseline": "6.2.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.2.2",
diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json
index 4bed0c4..3c90caf 100644
--- a/versions/l-/libyaml.json
+++ b/versions/l-/libyaml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7",
+      "version-string": "0.2.5",
+      "port-version": 3
+    },
     {
       "git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef",
       "version-string": "0.2.5",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index ce35abd..bae58a9 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a",
+      "version-semver": "6.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc",
       "version-semver": "6.2.2",

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/qtapplicationmanager/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 qtapplicationmanager but no changes to version or port version.
-- Version: 6.2.2
-- Old SHA: ca033ed7578b002c1ce195d879c622333231d159
-- New SHA: 7b070b73fa86e78cbe7dc6289f434a680efac168
-- 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 7bb175eafedb203f19b18cf211666ec728c7461a -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 9624e79..d17d00b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4094,7 +4094,7 @@
     },
     "libyaml": {
       "baseline": "0.2.5",
-      "port-version": 2
+      "port-version": 3
     },
     "libyuv": {
       "baseline": "2021-04-15",
@@ -5698,7 +5698,7 @@
     },
     "qtbase": {
       "baseline": "6.2.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.2.2",
diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json
index 4bed0c4..3c90caf 100644
--- a/versions/l-/libyaml.json
+++ b/versions/l-/libyaml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7",
+      "version-string": "0.2.5",
+      "port-version": 3
+    },
     {
       "git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef",
       "version-string": "0.2.5",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index ce35abd..bae58a9 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a",
+      "version-semver": "6.2.2",
+      "port-version": 1
+    },
     {
       "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc",
       "version-semver": "6.2.2",

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/qtapplicationmanager/portfile.cmake

@Neumann-A Neumann-A marked this pull request as ready for review December 8, 2021 23:22
@PhoebeHui PhoebeHui self-assigned this Dec 8, 2021
@PhoebeHui PhoebeHui added the category:port-bug The issue is with a library, which is something the port should already support label Dec 8, 2021
@PhoebeHui PhoebeHui changed the title [Qt6] add FETCH_REF for qt modules without tag [vcpkg baseline] [Qt6] add FETCH_REF for qt modules without tag Dec 8, 2021
@BillyONeal
Copy link
Member

Thank you so much :D :D :D <3

@BillyONeal BillyONeal merged commit 74db2af into microsoft:master Dec 8, 2021
@PhoebeHui
Copy link
Contributor

@Neumann-A, I still could repro qtinterfaceframework failrues locally with these changes, it seems use the binary cache in CI testing, so it passed in CI testing.

https://dev.azure.com/vcpkg/public/_build/results?buildId=64325&view=logs&j=7922e5c4-0103-5f8f-ad17-45ce9bb98e80&t=491b9f02-7edc-5990-cda1-511e95a3768e

Starting package 77/98: qtinterfaceframework:x64-windows
Installing package qtinterfaceframework[core]:x64-windows...
Elapsed time for package qtinterfaceframework:x64-windows: 267 ms

@Neumann-A
Copy link
Contributor Author

@PhoebeHui you need to look at the very first ci run of this pr. It rebuild qt completly and succesful.

@Neumann-A Neumann-A deleted the fix_qt_ports_without_tags branch December 9, 2021 05:21
@PhoebeHui
Copy link
Contributor

PhoebeHui commented Dec 9, 2021

I only find one run for this PR https://dev.azure.com/vcpkg/public/_build?definitionId=27&_a=summary&keywordFilter=21925.

After I delete "E:\vcpkg\src\vcpkg\downloads\git-tmp\.git\shallow" in my local machine, this issue has gone. The source file fetched successfully.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[<qtinterfaceframework>] build failure
4 participants