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

[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports #24066

Merged
merged 50 commits into from
Apr 25, 2022

Conversation

bold84
Copy link
Contributor

@bold84 bold84 commented Apr 10, 2022

Describe the pull request

  • What does your PR fix?

    Updates Skia to newer version

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    unchanged

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@bold84 bold84 changed the title Update skia [skia] Update skia Apr 10, 2022
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:

  • ports/skia/vcpkg.json

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

@bold84 bold84 marked this pull request as draft April 10, 2022 12:50
@JonLiu1993 JonLiu1993 self-assigned this Apr 11, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 11, 2022
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 skia but no changes to version or port version.
-- Version: 2022-04-10#8
-- Old SHA: f81f5433b1504578917d63c5f339e80af0853d7f
-- New SHA: 3ec42896de4132b03838730b412301a0239cfe02
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

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

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

@JonLiu1993
Copy link
Member

@bold84 , If this pr is ready for review please let me know, thanks!

@bold84
Copy link
Contributor Author

bold84 commented Apr 14, 2022

This depends on #24142

@JonLiu1993 JonLiu1993 added the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 15, 2022
@bold84 bold84 changed the title [skia] Update skia [gn,skia] Update Apr 15, 2022
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 5d66a98f64188bbd806b8e62e66c097d90eb3224 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 11a05e6..84e8a1b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6517,7 +6517,7 @@
       "port-version": 0
     },
     "skia": {
-      "baseline": "2022-04-10",
+      "baseline": "2022-04-15",
       "port-version": 9
     },
     "skyr-url": {
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 79d988c..944f71f 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83d939524e7184577f3f9154f5e0f4ae3b92c2b4",
+      "version-date": "2022-04-15",
+      "port-version": 9
+    },
     {
       "git-tree": "68e77104f54fa164b2890ae0eb860315b8cf318c",
       "version-date": "2022-04-10",

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/skia/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.

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 5d66a98f64188bbd806b8e62e66c097d90eb3224 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index ef1001d..d0cc13e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6517,7 +6517,7 @@
       "port-version": 0
     },
     "skia": {
-      "baseline": "2022-04-10",
+      "baseline": "2022-04-15",
       "port-version": 9
     },
     "skyr-url": {
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 79d988c..944f71f 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83d939524e7184577f3f9154f5e0f4ae3b92c2b4",
+      "version-date": "2022-04-15",
+      "port-version": 9
+    },
     {
       "git-tree": "68e77104f54fa164b2890ae0eb860315b8cf318c",
       "version-date": "2022-04-10",

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/crashpad/vcpkg.json
  • ports/skia/vcpkg.json

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

@bold84
Copy link
Contributor Author

bold84 commented Apr 15, 2022

This is weird... I don't have these errors on two Windows machines with Windows 11 and VS 2022.

What's even weirder is that even the zeroc-ice port (x64-windows-static) suddenly fails on your windows servers, although nothing was changed.

Screen Shot 2022-04-16 at 03 02 56

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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json

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

@bold84 bold84 changed the title [gn,skia] Update [gn,skia,crashpad] Update Apr 15, 2022
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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json

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

@dg0yt
Copy link
Contributor

dg0yt commented Apr 16, 2022

What's even weirder is that even the zeroc-ice port (x64-windows-static) suddenly fails on your windows servers, although nothing was changed.

This is a baseline regression, also failing in the daily full builds: https://dev.azure.com/vcpkg/public/_build/results?buildId=70644&view=results

@bold84
Copy link
Contributor Author

bold84 commented Apr 16, 2022

@dg0yt
Thank you for letting me know. I figured that out by now 😊.
I was able to reproduce the issues and make everything build successfully, despite the regression.

I think that this was a good opportunity to fix a potential problem with the zeroc-ice port.

I will push the changes soon (still in bed).

@dg0yt
Copy link
Contributor

dg0yt commented Apr 16, 2022

@bold84 There is already other work on zero-ice: #24169

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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json

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

@bold84 bold84 changed the title [gn,skia,crashpad] Update [gn,skia,crashpad,zeroc-ice] Update Apr 16, 2022
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:

  • ports/crashpad/vcpkg.json
  • ports/skia/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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json

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

@bold84 bold84 marked this pull request as ready for review April 16, 2022 16:00
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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json
  • ports/v8/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:

  • ports/crashpad/vcpkg.json
  • ports/skia/vcpkg.json
  • ports/v8/vcpkg.json

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

bold84 and others added 15 commits April 22, 2022 09:33
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
@strega-nil-ms
Copy link
Contributor

rebased and fixed spaces; gonna wait for green one last time :)

@JackBoosY JackBoosY removed the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Apr 24, 2022
@BillyONeal BillyONeal merged commit ce910bb into microsoft:master Apr 25, 2022
@BillyONeal
Copy link
Member

rebased and fixed spaces; gonna wait for green one last time :)

I didn't review; I just merged green build based on this :)

@@ -119,6 +122,9 @@ file(REMOVE_RECURSE
configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm currently running into the following error while using the latest version of crashpad (2022-04-16) on Windows. Can this line be responsible for the missing files and is this an intended behavior?

Error: %REDACTED%\build\windows-release\vcpkg_installed\x64-windows\include\crashpad\base/files/file_path.h(110): fatal error C1083: Cannot open include file: 'build/build_config.h': No such file or directory

I'm not sure if it's related to #24510 or if it deserves its own issue?

CC @bold84

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created a new issue regarding this problem #25066

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR! category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants