From 39bb98d817fe168bf14a1ce93d4f0692363e5016 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 4 May 2022 12:14:23 +0200 Subject: [PATCH 1/5] use bundled gtest --- dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat index 6423720c225..129ad55edd2 100644 --- a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat +++ b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat @@ -70,6 +70,7 @@ cmake -G "Visual Studio 16 2019" -A x64 ^ -DARROW_WITH_SNAPPY=ON ^ -DARROW_WITH_ZLIB=ON ^ -DARROW_WITH_ZSTD=ON ^ + -GTest_SOURCE=BUNDLED ^ -DCMAKE_BUILD_TYPE=release ^ -DCMAKE_UNITY_BUILD=ON ^ .. || exit /B 1 From a29f8ab4be5085d0227616fd4c8451d21088db49 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 4 May 2022 12:16:20 +0200 Subject: [PATCH 2/5] fix typo --- dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat index 129ad55edd2..207ca3a635a 100644 --- a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat +++ b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat @@ -70,7 +70,7 @@ cmake -G "Visual Studio 16 2019" -A x64 ^ -DARROW_WITH_SNAPPY=ON ^ -DARROW_WITH_ZLIB=ON ^ -DARROW_WITH_ZSTD=ON ^ - -GTest_SOURCE=BUNDLED ^ + -DTest_SOURCE=BUNDLED ^ -DCMAKE_BUILD_TYPE=release ^ -DCMAKE_UNITY_BUILD=ON ^ .. || exit /B 1 From f74d85e80ef7d87847b8ddddf492385151a0afa0 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 4 May 2022 12:19:23 +0200 Subject: [PATCH 3/5] fix typo --- dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat index 207ca3a635a..d9c97ce697a 100644 --- a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat +++ b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat @@ -70,7 +70,7 @@ cmake -G "Visual Studio 16 2019" -A x64 ^ -DARROW_WITH_SNAPPY=ON ^ -DARROW_WITH_ZLIB=ON ^ -DARROW_WITH_ZSTD=ON ^ - -DTest_SOURCE=BUNDLED ^ + -DGTest_SOURCE=BUNDLED ^ -DCMAKE_BUILD_TYPE=release ^ -DCMAKE_UNITY_BUILD=ON ^ .. || exit /B 1 From c56853e44a0708ae7b3388d81a45b555092cc587 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 4 May 2022 14:37:00 +0200 Subject: [PATCH 4/5] use system flag --- dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat index d9c97ce697a..2839d33c721 100644 --- a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat +++ b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat @@ -70,7 +70,7 @@ cmake -G "Visual Studio 16 2019" -A x64 ^ -DARROW_WITH_SNAPPY=ON ^ -DARROW_WITH_ZLIB=ON ^ -DARROW_WITH_ZSTD=ON ^ - -DGTest_SOURCE=BUNDLED ^ + -DGTest_SOURCE=SYSTEM ^ -DCMAKE_BUILD_TYPE=release ^ -DCMAKE_UNITY_BUILD=ON ^ .. || exit /B 1 From 10e6832fe159eef3ea62cecd142044c10e615608 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 4 May 2022 17:50:48 +0200 Subject: [PATCH 5/5] add step to download tz data --- dev/tasks/vcpkg-tests/github.windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/tasks/vcpkg-tests/github.windows.yml b/dev/tasks/vcpkg-tests/github.windows.yml index ad3e793a6c3..2877d20868d 100644 --- a/dev/tasks/vcpkg-tests/github.windows.yml +++ b/dev/tasks/vcpkg-tests/github.windows.yml @@ -35,6 +35,9 @@ jobs: git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} git -C arrow checkout FETCH_HEAD git -C arrow submodule update --init --recursive + - name: Download Timezone Database + shell: bash + run: arrow/ci/scripts/download_tz_database.sh - name: Remove and Reinstall vcpkg # When running vcpkg in Github Actions on Windows, remove the # preinstalled vcpkg and install the newest version from source.