From fe66fe0b4d24295a1849338100dab547e7d9cd97 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 1 Jun 2021 13:02:17 -0500 Subject: [PATCH 1/5] bundle source for gRPC and protobuf --- ci/docker/ubuntu-20.04-cpp.dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index 022fc3ee22c..c804b7809c1 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -75,6 +75,7 @@ RUN apt-get update -y -q && \ libcurl4-openssl-dev \ libgflags-dev \ libgoogle-glog-dev \ + libgrpc++-dev \ liblz4-dev \ libprotobuf-dev \ libprotoc-dev \ @@ -88,6 +89,7 @@ RUN apt-get update -y -q && \ ninja-build \ pkg-config \ protobuf-compiler \ + protobuf-compiler-grpc \ rapidjson-dev \ tzdata \ wget && \ @@ -129,8 +131,10 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_ZSTD=ON \ AWSSDK_SOURCE=BUNDLED \ GTest_SOURCE=BUNDLED \ + gRPC_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ PARQUET_BUILD_EXAMPLES=ON \ PARQUET_BUILD_EXECUTABLES=ON \ PATH=/usr/lib/ccache/:$PATH \ - PYTHON=python3 + PYTHON=python3 \ + Protobuf_SOURCE=BUNDLED From acc3f094d3814ec4bc8a58d0782147bcfec0f28e Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 1 Jun 2021 13:45:06 -0500 Subject: [PATCH 2/5] re-alpha --- ci/docker/ubuntu-20.04-cpp.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index c804b7809c1..ecf260a19cd 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -136,5 +136,5 @@ ENV ARROW_BUILD_TESTS=ON \ PARQUET_BUILD_EXAMPLES=ON \ PARQUET_BUILD_EXECUTABLES=ON \ PATH=/usr/lib/ccache/:$PATH \ - PYTHON=python3 \ - Protobuf_SOURCE=BUNDLED + Protobuf_SOURCE=BUNDLED \ + PYTHON=python3 From ae9c62dc0c4b82f2a0d72036baf31404bd4c24bb Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 1 Jun 2021 16:17:47 -0500 Subject: [PATCH 3/5] add 20.04 docs build --- dev/tasks/tasks.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index ca21496b913..35873a7e0c0 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -949,6 +949,12 @@ tasks: UBUNTU: "20.10" run: ubuntu-docs + test-ubuntu-20.04-docs: + ci: azure + template: docker-tests/azure.linux.yml + params: + run: ubuntu-docs + ############################## vcpkg tests ################################## test-build-vcpkg-win: From c0b8747a4591c4c77316cb20ec603cfde54de2bc Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 1 Jun 2021 16:18:20 -0500 Subject: [PATCH 4/5] clarify that the docs is the default ubuntu version --- dev/tasks/tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 35873a7e0c0..23ff18d6dec 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -949,7 +949,7 @@ tasks: UBUNTU: "20.10" run: ubuntu-docs - test-ubuntu-20.04-docs: + test-ubuntu-default-docs: ci: azure template: docker-tests/azure.linux.yml params: From f7ea8ec54f29bef405cf68fb9bf30703aedaf790 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 1 Jun 2021 19:27:49 -0500 Subject: [PATCH 5/5] PR comments --- ci/docker/ubuntu-20.04-cpp.dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index ecf260a19cd..c75c013799a 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -75,7 +75,6 @@ RUN apt-get update -y -q && \ libcurl4-openssl-dev \ libgflags-dev \ libgoogle-glog-dev \ - libgrpc++-dev \ liblz4-dev \ libprotobuf-dev \ libprotoc-dev \ @@ -89,7 +88,6 @@ RUN apt-get update -y -q && \ ninja-build \ pkg-config \ protobuf-compiler \ - protobuf-compiler-grpc \ rapidjson-dev \ tzdata \ wget && \