From 8a8cb5434803b3b624bee4f83d136c14067ca4cc Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 10 Feb 2024 19:22:44 +0900 Subject: [PATCH] GH-40011: [CI] Update Fedora to 39 from 38 (#40012) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Rationale for this change Fedora 39 is the latest release and Fedora 38 will reach EOL on 2024-05-14. ### What changes are included in this PR? Use Fedora 39. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * Closes: #40011 Lead-authored-by: Sutou Kouhei Co-authored-by: Raúl Cumplido Signed-off-by: Raúl Cumplido --- .env | 2 +- ...{fedora-38-cpp.dockerfile => fedora-39-cpp.dockerfile} | 7 +++++-- dev/tasks/tasks.yml | 8 ++++---- docker-compose.yml | 4 ++-- python/examples/minimal_build/Dockerfile.fedora | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) rename ci/docker/{fedora-38-cpp.dockerfile => fedora-39-cpp.dockerfile} (92%) diff --git a/.env b/.env index eb87dc62bdd8c..00c238421d301 100644 --- a/.env +++ b/.env @@ -49,7 +49,7 @@ ULIMIT_CORE=-1 ALMALINUX=8 ALPINE_LINUX=3.16 DEBIAN=11 -FEDORA=38 +FEDORA=39 UBUNTU=20.04 # Default versions for various dependencies diff --git a/ci/docker/fedora-38-cpp.dockerfile b/ci/docker/fedora-39-cpp.dockerfile similarity index 92% rename from ci/docker/fedora-38-cpp.dockerfile rename to ci/docker/fedora-39-cpp.dockerfile index 2dcc094ee20c5..c8e98bdd00b11 100644 --- a/ci/docker/fedora-38-cpp.dockerfile +++ b/ci/docker/fedora-39-cpp.dockerfile @@ -16,7 +16,7 @@ # under the License. ARG arch -FROM ${arch}/fedora:38 +FROM ${arch}/fedora:39 ARG arch # install dependencies @@ -76,6 +76,8 @@ RUN /arrow/ci/scripts/install_gcs_testbench.sh default COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin +# PYARROW_TEST_GANDIVA=OFF: GH-39695: We need to make LLVM symbols visible in +# Python process explicitly if we use LLVM 17 or later. ENV absl_SOURCE=BUNDLED \ ARROW_ACERO=ON \ ARROW_BUILD_TESTS=ON \ @@ -103,4 +105,5 @@ ENV absl_SOURCE=BUNDLED \ google_cloud_cpp_storage_SOURCE=BUNDLED \ PARQUET_BUILD_EXAMPLES=ON \ PARQUET_BUILD_EXECUTABLES=ON \ - PATH=/usr/lib/ccache/:$PATH + PATH=/usr/lib/ccache/:$PATH \ + PYARROW_TEST_GANDIVA=OFF diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index cf04d29715306..8a32724b153fe 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1104,12 +1104,12 @@ tasks: image: debian-cpp {% endfor %} - test-fedora-38-cpp: + test-fedora-39-cpp: ci: github template: docker-tests/github.linux.yml params: env: - FEDORA: 38 + FEDORA: 39 image: fedora-cpp {% for cpp_standard in [20] %} @@ -1217,12 +1217,12 @@ tasks: UBUNTU: 22.04 image: ubuntu-python - test-fedora-38-python-3: + test-fedora-39-python-3: ci: azure template: docker-tests/azure.linux.yml params: env: - FEDORA: 38 + FEDORA: 39 image: fedora-python test-r-linux-valgrind: diff --git a/docker-compose.yml b/docker-compose.yml index 7ae625a017417..aec685775aab1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -658,7 +658,7 @@ services: # docker-compose run --rm fedora-cpp # Parameters: # ARCH: amd64, arm64v8, ... - # FEDORA: 38 + # FEDORA: 39 image: ${REPO}:${ARCH}-fedora-${FEDORA}-cpp build: context: . @@ -959,7 +959,7 @@ services: # docker-compose run --rm fedora-python # Parameters: # ARCH: amd64, arm64v8, ... - # FEDORA: 38 + # FEDORA: 39 image: ${REPO}:${ARCH}-fedora-${FEDORA}-python-3 build: context: . diff --git a/python/examples/minimal_build/Dockerfile.fedora b/python/examples/minimal_build/Dockerfile.fedora index cc3d62bec0ebe..e7b9600b67b0e 100644 --- a/python/examples/minimal_build/Dockerfile.fedora +++ b/python/examples/minimal_build/Dockerfile.fedora @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM fedora:35 +FROM fedora:39 RUN dnf update -y && \ dnf install -y \