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

[wxwidgets] CMake re-run must not change libs #24499

Merged
merged 3 commits into from
May 5, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented May 1, 2022

@dg0yt dg0yt force-pushed the wxwidgets-reconfigure branch from c55edb6 to e6dccec Compare May 1, 2022 19:48
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 c8a56fdc1594dfe134213c8c3edf1cc620e4fb37 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index d24eaa5..68bf462 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7530,7 +7530,7 @@
     },
     "wxwidgets": {
       "baseline": "3.1.5",
-      "port-version": 10
+      "port-version": 11
     },
     "x-plane": {
       "baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index 53c9c27..36019e7 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "530e4eea22c53907218b36f35308621723e9f8db",
+      "version-semver": "3.1.5",
+      "port-version": 11
+    },
     {
       "git-tree": "99203047a716a1b39d06fb93c48daebb4b184141",
       "version-semver": "3.1.5",

@dg0yt
Copy link
Contributor Author

dg0yt commented May 1, 2022

@marekr This change seems to fix #24489. I would appreciate if you could test it locally. I use MSVC only in CI, and so I can only read logs from build failures.

@marekr
Copy link
Contributor

marekr commented May 1, 2022

@marekr This change seems to fix #24489. I would appreciate if you could test it locally. I use MSVC only in CI, and so I can only read logs from build failures.

Ran it against my project and it's working fine after multiple reconfigures, twiddling of cmakecache manually.

@dg0yt dg0yt marked this pull request as ready for review May 2, 2022 04:17
@dg0yt dg0yt marked this pull request as draft May 2, 2022 05:03
@dg0yt dg0yt force-pushed the wxwidgets-reconfigure branch from eb9b76a to f14ea0c Compare May 2, 2022 05:46
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 wxwidgets but no changes to version or port version.
-- Version: 3.1.5#10
-- Old SHA: 99203047a716a1b39d06fb93c48daebb4b184141
-- New SHA: 01fced0f27a5b09fccf3d4e43ab8b614fa2b7dc0
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@dg0yt
Copy link
Contributor Author

dg0yt commented May 2, 2022

Windows CI test output (without the fix) is now:

CMake Error at scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake:29 (message):
  wxWidgets libraries changed after CMake re-run

  actual:

  --
  wxWidgets_LIBRARIES:=D:/installed/x64-windows-static/lib/wxmsw31u_core.lib\;D:/installed/x64-windows-static/lib/wxbase31u.lib\;D:/installed/x64-windows-static/lib/wxregexu.lib\;winmm\;comctl32\;uuid\;oleacc\;uxtheme\;rpcrt4\;shlwapi\;version\;wsock32\;optimized\;D:/installed/x64-windows-static/lib/libexpatMD.lib\;debug\;D:/installed/x64-windows-static/debug/lib/libexpatdMD.lib\;optimized\;D:/installed/x64-windows-static/lib/jpeg.lib\;debug\;D:/installed/x64-windows-static/debug/lib/jpeg.lib\;optimized\;D:/installed/x64-windows-static/lib/libpng16.lib\;debug\;D:/installed/x64-windows-static/debug/lib/libpng16d.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib\;optimized\;D:/installed/x64-windows-static/lib/tiff.lib\;debug\;D:/installed/x64-windows-static/debug/lib/tiffd.lib\;optimized\;D:/installed/x64-windows-static/lib/lzma.lib\;debug\;D:/installed/x64-windows-static/debug/lib/lzma.lib\;optimized\;D:/installed/x64-windows-static/lib/jpeg.lib\;debug\;D:/installed/x64-windows-static/debug/lib/jpeg.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib


  expected:

   -- wxWidgets_LIBRARIES:=debug\;D:/installed/x64-windows-static/debug/lib/wxmsw31ud_core.lib\;optimized\;D:/installed/x64-windows-static/lib/wxmsw31u_core.lib\;debug\;D:/installed/x64-windows-static/debug/lib/wxbase31ud.lib\;optimized\;D:/installed/x64-windows-static/lib/wxbase31u.lib\;debug\;D:/installed/x64-windows-static/debug/lib/wxregexud.lib\;optimized\;D:/installed/x64-windows-static/lib/wxregexu.lib\;winmm\;comctl32\;uuid\;oleacc\;uxtheme\;rpcrt4\;shlwapi\;version\;wsock32\;optimized\;D:/installed/x64-windows-static/lib/libexpatMD.lib\;debug\;D:/installed/x64-windows-static/debug/lib/libexpatdMD.lib\;optimized\;D:/installed/x64-windows-static/lib/jpeg.lib\;debug\;D:/installed/x64-windows-static/debug/lib/jpeg.lib\;optimized\;D:/installed/x64-windows-static/lib/libpng16.lib\;debug\;D:/installed/x64-windows-static/debug/lib/libpng16d.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib\;optimized\;D:/installed/x64-windows-static/lib/tiff.lib\;debug\;D:/installed/x64-windows-static/debug/lib/tiffd.lib\;optimized\;D:/installed/x64-windows-static/lib/lzma.lib\;debug\;D:/installed/x64-windows-static/debug/lib/lzma.lib\;optimized\;D:/installed/x64-windows-static/lib/jpeg.lib\;debug\;D:/installed/x64-windows-static/debug/lib/jpeg.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib\;optimized\;D:/installed/x64-windows-static/lib/zlib.lib\;debug\;D:/installed/x64-windows-static/debug/lib/zlibd.lib

@dg0yt dg0yt marked this pull request as ready for review May 2, 2022 06:17
@BillyONeal BillyONeal merged commit 5219a7a into microsoft:master May 5, 2022
@BillyONeal
Copy link
Member

Thanks for the CI improvement!

@dg0yt dg0yt deleted the wxwidgets-reconfigure branch May 19, 2022 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants