From 4b0869f49970543079867912be3baa3e60d2319f Mon Sep 17 00:00:00 2001 From: Weston Pace Date: Mon, 3 Apr 2023 14:04:48 -0700 Subject: [PATCH 1/2] Configure alpine linux nightly job to build gtest from source --- ci/docker/alpine-linux-3.16-cpp.dockerfile | 1 - docker-compose.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/alpine-linux-3.16-cpp.dockerfile b/ci/docker/alpine-linux-3.16-cpp.dockerfile index f269fa548c1..359f55470e1 100644 --- a/ci/docker/alpine-linux-3.16-cpp.dockerfile +++ b/ci/docker/alpine-linux-3.16-cpp.dockerfile @@ -37,7 +37,6 @@ RUN apk add \ glog-dev \ gmock \ grpc-dev \ - gtest-dev \ libxml2-dev \ llvm13-dev \ llvm13-static \ diff --git a/docker-compose.yml b/docker-compose.yml index 46024c43cb2..77c951b5c37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -223,6 +223,8 @@ services: <<: *ccache ARROW_ENABLE_TIMING_TESTS: # inherit ARROW_MIMALLOC: "ON" + GTest_SOURCE: "BUNDLED" # Alpine's GTest is not built against + # C++17 so we build from source volumes: &alpine-linux-volumes - .:/arrow:delegated - ${DOCKER_VOLUME_PREFIX}alpine-linux-ccache:/ccache:delegated From 667fc105f3fc038db0beef518fa577f7660eaf03 Mon Sep 17 00:00:00 2001 From: Weston Pace Date: Mon, 3 Apr 2023 18:38:08 -0700 Subject: [PATCH 2/2] Moved GTest_SOURCE=BUNDLED to the dockerfile for consistency per review comment --- ci/docker/alpine-linux-3.16-cpp.dockerfile | 1 + docker-compose.yml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/docker/alpine-linux-3.16-cpp.dockerfile b/ci/docker/alpine-linux-3.16-cpp.dockerfile index 359f55470e1..6edc405dc61 100644 --- a/ci/docker/alpine-linux-3.16-cpp.dockerfile +++ b/ci/docker/alpine-linux-3.16-cpp.dockerfile @@ -95,6 +95,7 @@ ENV ARROW_ACERO=ON \ ARROW_WITH_ZSTD=ON \ AWSSDK_SOURCE=BUNDLED \ google_cloud_cpp_storage_SOURCE=BUNDLED \ + GTest_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ PATH=/usr/lib/ccache/:$PATH \ xsimd_SOURCE=BUNDLED diff --git a/docker-compose.yml b/docker-compose.yml index 77c951b5c37..46024c43cb2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -223,8 +223,6 @@ services: <<: *ccache ARROW_ENABLE_TIMING_TESTS: # inherit ARROW_MIMALLOC: "ON" - GTest_SOURCE: "BUNDLED" # Alpine's GTest is not built against - # C++17 so we build from source volumes: &alpine-linux-volumes - .:/arrow:delegated - ${DOCKER_VOLUME_PREFIX}alpine-linux-ccache:/ccache:delegated