From 20b6c871178f20661b849ad5677bd8ecae55cf19 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 9 Mar 2022 15:40:57 +0100 Subject: [PATCH 1/3] build: Specify `zeromq` port explicitly for MSVC builds Current port 4 is broken: - https://github.com/microsoft/vcpkg/pull/22681#issuecomment-1061312320 --- build_msvc/vcpkg.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build_msvc/vcpkg.json b/build_msvc/vcpkg.json index d8753ec21f4..b69af05acb8 100644 --- a/build_msvc/vcpkg.json +++ b/build_msvc/vcpkg.json @@ -14,5 +14,13 @@ "features": ["thread"] }, "zeromq" + ], + "builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090", + "overrides": [ + { + "name": "zeromq", + "version": "4.3.4", + "port-version": 3 + } ] } From 7ff43e5372c4606ecb75d6892b4bb0ccb4165b80 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 10 Mar 2022 07:51:52 +0100 Subject: [PATCH 2/3] ci: Invalidate vcpkg binary cache if dependencies changed --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index fce3a1bb8ee..e07ff9796ed 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -130,6 +130,7 @@ task: reupload_on_changes: true fingerprint_script: - echo %CI_VCPKG_TAG% + - type build_msvc\vcpkg.json - msbuild -version populate_script: - mkdir %VCPKG_DEFAULT_BINARY_CACHE% From c3296b21e40be3a5cb7060ceb8f1b6db1fd79e65 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 10 Mar 2022 07:54:01 +0100 Subject: [PATCH 3/3] build: Drop `double-conversion` from MSVC dependencies Qt uses its own `double-conversion`. --- build_msvc/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/build_msvc/vcpkg.json b/build_msvc/vcpkg.json index b69af05acb8..48b4d1fd20f 100644 --- a/build_msvc/vcpkg.json +++ b/build_msvc/vcpkg.json @@ -8,7 +8,6 @@ "boost-signals2", "boost-test", "sqlite3", - "double-conversion", { "name": "libevent", "features": ["thread"]