From d57064960cb81da0f91bcf52ab60b95ef26df225 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 30 Jan 2020 16:52:51 +0100 Subject: [PATCH 1/3] ARROW-7726: [CI] [C++] Use boost binaries on Windows GHA build [skip appveyor] --- .github/workflows/cpp.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index abc3b8f4d91..cf746c327db 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -175,10 +175,15 @@ jobs: ARROW_BUILD_STATIC: OFF ARROW_BOOST_USE_SHARED: OFF ARROW_VERBOSE_THIRDPARTY_BUILD: OFF - BOOST_SOURCE: BUNDLED + BOOST_ROOT: C:\local\boost_1_67_0 + BOOST_LIBRARYDIR: C:\local\boost_1_67_0\lib64-msvc-14.1\ steps: - name: Disable Crash Dialogs run: reg add "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f + - name: Installed Packages + run: choco list -l + - name: Install Boost + run: choco install -y boost-msvc-14.1 - name: Checkout Arrow uses: actions/checkout@v1 with: From eb5db8fc154609a571610f19e5d3f6f1895900a9 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 3 Feb 2020 16:04:29 +0100 Subject: [PATCH 2/3] Try a more flexible way of finding Boost --- .github/workflows/cpp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index cf746c327db..b2060918fb0 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -190,7 +190,11 @@ jobs: submodules: true - name: Build shell: bash - run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build + run: | + export BOOST_ROOT="$(ls -1 /c/local/boost_* | tail -n1)" + export BOOST_LIBRARYDIR="${BOOST_ROOT}\\lib64-msvc-14.1" + echo "BOOST_ROOT: ${BOOST_ROOT}" + ci/scripts/cpp_build.sh $(pwd) $(pwd)/build - name: Test shell: bash run: ci/scripts/cpp_test.sh $(pwd) $(pwd)/build From e877622b9552bb1500f30cc54dc709ddf9bf8fd9 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 3 Feb 2020 17:07:32 +0100 Subject: [PATCH 3/3] Revert "Try a more flexible way of finding Boost" This reverts commit eb5db8fc154609a571610f19e5d3f6f1895900a9. --- .github/workflows/cpp.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index b2060918fb0..cf746c327db 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -190,11 +190,7 @@ jobs: submodules: true - name: Build shell: bash - run: | - export BOOST_ROOT="$(ls -1 /c/local/boost_* | tail -n1)" - export BOOST_LIBRARYDIR="${BOOST_ROOT}\\lib64-msvc-14.1" - echo "BOOST_ROOT: ${BOOST_ROOT}" - ci/scripts/cpp_build.sh $(pwd) $(pwd)/build + run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build - name: Test shell: bash run: ci/scripts/cpp_test.sh $(pwd) $(pwd)/build