From 2cfd1864a68c2e6bcb22db46f2fb030860bf6df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 12:33:39 +0100 Subject: [PATCH 1/3] [Release] Uninstall Gtest and Gmock --- dev/release/verify-release-candidate.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index d450a3268a51..6634228bce09 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -50,6 +50,10 @@ call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA call activate %_VERIFICATION_CONDA_ENV% || exit /B 1 +@rem With MSVC we always bundle a more recent GTest which causes a link conflict +@rem for more context, see https://issues.apache.org/jira/browse/ARROW-15378 +conda -y remove gtest gmock + set GENERATOR=Visual Studio 15 2017 Win64 set CONFIGURATION=release From 4f296131c178d4830966fde95525becb64a115b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 12:36:54 +0100 Subject: [PATCH 2/3] [Release] Fix conda command --- dev/release/verify-release-candidate.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index 6634228bce09..5d628d74d825 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -52,7 +52,7 @@ call activate %_VERIFICATION_CONDA_ENV% || exit /B 1 @rem With MSVC we always bundle a more recent GTest which causes a link conflict @rem for more context, see https://issues.apache.org/jira/browse/ARROW-15378 -conda -y remove gtest gmock +conda remove -y gtest gmock set GENERATOR=Visual Studio 15 2017 Win64 set CONFIGURATION=release From ec513b98571caac286eb2cc4f198a014f4a82bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 20 Jan 2022 13:28:14 +0100 Subject: [PATCH 3/3] [Release] Fix conda call --- dev/release/verify-release-candidate.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat index 5d628d74d825..387eb25e1db7 100644 --- a/dev/release/verify-release-candidate.bat +++ b/dev/release/verify-release-candidate.bat @@ -52,7 +52,7 @@ call activate %_VERIFICATION_CONDA_ENV% || exit /B 1 @rem With MSVC we always bundle a more recent GTest which causes a link conflict @rem for more context, see https://issues.apache.org/jira/browse/ARROW-15378 -conda remove -y gtest gmock +call conda remove -y gtest gmock || exit /B 1 set GENERATOR=Visual Studio 15 2017 Win64 set CONFIGURATION=release