From c8f6537b80831b1bd951b764bb4fa1f1c7973d83 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 18 Mar 2021 15:06:03 -0700 Subject: [PATCH] [ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (#16774) * remove host-only nature of vcpkg-cmake-* ports * versions * fix fmt on uwp --- ports/fmt/portfile.cmake | 2 ++ ports/fmt/vcpkg.json | 2 +- ports/vcpkg-cmake-config/portfile.cmake | 3 ++- ports/vcpkg-cmake-config/vcpkg.json | 3 ++- ports/vcpkg-cmake/portfile.cmake | 3 ++- ports/vcpkg-cmake/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 24 ++++++++++++------------ versions/baseline.json | 6 +++--- versions/f-/fmt.json | 5 +++++ versions/v-/vcpkg-cmake-config.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 11 files changed, 41 insertions(+), 20 deletions(-) diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index c91f568a29..aef43b474d 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-warning4189.patch ) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE # with MSBuild (on UWP), fmt writes into the source directory OPTIONS -DFMT_CMAKE_DIR=share/fmt -DFMT_TEST=OFF diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index debc7b8e3e..880adf38b2 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmt", "version": "7.1.3", - "port-version": 1, + "port-version": 2, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/ports/vcpkg-cmake-config/portfile.cmake b/ports/vcpkg-cmake-config/portfile.cmake index 45ecf62fd9..fc3dbafd51 100644 --- a/ports/vcpkg-cmake-config/portfile.cmake +++ b/ports/vcpkg-cmake-config/portfile.cmake @@ -1,5 +1,6 @@ if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) - message(FATAL_ERROR "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.") + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.") endif() file(INSTALL diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 26737e44fd..63f53948e8 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-02-26" + "version-date": "2021-02-26", + "port-version": 1 } diff --git a/ports/vcpkg-cmake/portfile.cmake b/ports/vcpkg-cmake/portfile.cmake index 7f275926e1..70b1ed128c 100644 --- a/ports/vcpkg-cmake/portfile.cmake +++ b/ports/vcpkg-cmake/portfile.cmake @@ -1,5 +1,6 @@ if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) - message(FATAL_ERROR "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") endif() file(INSTALL diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 029b7d6eb3..f8dfb94da9 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2021-02-28" + "version-date": "2021-02-28", + "port-version": 1 } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b822cb30b1..3c8fa04587 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -30,19 +30,19 @@ # Add new items alphabetically # script ports -vcpkg-cmake:arm64-windows=fail -vcpkg-cmake:arm-uwp=fail -vcpkg-cmake:x64-uwp=fail -vcpkg-cmake:x64-windows-static=fail -vcpkg-cmake:x64-windows-static-md=fail -vcpkg-cmake:x86-windows=fail +#vcpkg-cmake:arm64-windows=fail +#vcpkg-cmake:arm-uwp=fail +#vcpkg-cmake:x64-uwp=fail +#vcpkg-cmake:x64-windows-static=fail +#vcpkg-cmake:x64-windows-static-md=fail +#vcpkg-cmake:x86-windows=fail -vcpkg-cmake-config:arm64-windows=fail -vcpkg-cmake-config:arm-uwp=fail -vcpkg-cmake-config:x64-uwp=fail -vcpkg-cmake-config:x64-windows-static=fail -vcpkg-cmake-config:x64-windows-static-md=fail -vcpkg-cmake-config:x86-windows=fail +#vcpkg-cmake-config:arm64-windows=fail +#vcpkg-cmake-config:arm-uwp=fail +#vcpkg-cmake-config:x64-uwp=fail +#vcpkg-cmake-config:x64-windows-static=fail +#vcpkg-cmake-config:x64-windows-static-md=fail +#vcpkg-cmake-config:x86-windows=fail # other ports # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h diff --git a/versions/baseline.json b/versions/baseline.json index 0bf60efbc4..94d1c2c6a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1994,7 +1994,7 @@ }, "fmt": { "baseline": "7.1.3", - "port-version": 1 + "port-version": 2 }, "folly": { "baseline": "2020.10.19.00", @@ -6138,11 +6138,11 @@ }, "vcpkg-cmake": { "baseline": "2021-02-28", - "port-version": 0 + "port-version": 1 }, "vcpkg-cmake-config": { "baseline": "2021-02-26", - "port-version": 0 + "port-version": 1 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 9fc6b3c8c7..86345acc51 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71167ed3f3204ccfa0c7571ea5a89df1b113ed74", + "version": "7.1.3", + "port-version": 2 + }, { "git-tree": "4f8427eb0bd40da1856d4e67bde39a4fda689d72", "version": "7.1.3", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 555f90f1a3..5ad51b9182 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46d60d4dd4297bedecdcd308167ad2492b269183", + "version-date": "2021-02-26", + "port-version": 1 + }, { "git-tree": "d255b3d566a8861dcc99a958240463e678528066", "version-date": "2021-02-26", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index b93fc75088..9aa7949b41 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4abdcc88bd5ec2c76e320eb2ff4db665ee9913ac", + "version-date": "2021-02-28", + "port-version": 1 + }, { "git-tree": "b627b47898864ee5a880cea03b4dea64b9d81953", "version-date": "2021-02-28",