From a06b2618420ef89431373a9e8f07a5da64d546a5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 31 Jul 2023 15:27:33 +0900 Subject: [PATCH] GH-36941: [CI][Docs] Use system Protobuf (#36943) ### Rationale for this change We can reduce disk usage by using system Protobuf and gRPC. ### What changes are included in this PR? Use system Protobuf. We can use Protobuf 3.12.0 or later by #35962. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * Closes: #36941 Authored-by: Sutou Kouhei Signed-off-by: Sutou Kouhei --- dev/tasks/tasks.yml | 8 ++++++-- docker-compose.yml | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 05dafade97434..25bda38809e3b 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -64,7 +64,7 @@ groups: - r-binary-packages - ubuntu-* - wheel-* - - test-ubuntu-default-docs + - test-ubuntu-*-docs {############################# Testing tasks #################################} @@ -1498,10 +1498,12 @@ tasks: image: debian-go {% endfor %} - test-ubuntu-default-docs: + test-ubuntu-22.04-docs: ci: github template: docs/github.linux.yml params: + env: + UBUNTU: 22.04 pr_number: Unset flags: "-v $PWD/build/:/build/" image: ubuntu-docs @@ -1625,6 +1627,8 @@ tasks: ci: github template: docs/github.linux.yml params: + env: + UBUNTU: 22.04 pr_number: Unset flags: "-v $PWD/build/:/build/" image: ubuntu-docs diff --git a/docker-compose.yml b/docker-compose.yml index 8727aded2c825..fe98a30d0b92b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1745,7 +1745,6 @@ services: BUILD_DOCS_JS: "ON" BUILD_DOCS_PYTHON: "ON" BUILD_DOCS_R: "ON" - Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15 volumes: *ubuntu-volumes command: &docs-command > /bin/bash -c "