From 22f1bf870752072d6df1d511cdf4e4c138170095 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 7 Sep 2022 15:21:10 -0400 Subject: [PATCH 1/4] ARROW-17645: [CI] Get conda-integration building again --- ci/docker/conda-cpp.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 72a839cf57c..fa3c93e5b92 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -26,12 +26,14 @@ RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda COPY ci/conda_env_cpp.txt \ ci/conda_env_gandiva.txt \ /arrow/ci/ +# XXX(ARROW-17410,ARROW-17645): pin zlib due to bug in zlib 1.2.12 RUN mamba install -q -y \ --file arrow/ci/conda_env_cpp.txt \ --file arrow/ci/conda_env_gandiva.txt \ compilers \ doxygen \ - valgrind && \ + valgrind \ + zlib=1.2.11 && \ mamba clean --all # We want to install the GCS testbench using the same Python binary that the Conda code will use. From 4ae4297efdad6ff9064d2fd5b9aa533649b07163 Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 12 Sep 2022 12:53:36 -0400 Subject: [PATCH 2/4] Unpin zlib after patching upstream conda --- ci/docker/conda-cpp.dockerfile | 4 +--- ci/docker/conda-integration.dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index fa3c93e5b92..72a839cf57c 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -26,14 +26,12 @@ RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda COPY ci/conda_env_cpp.txt \ ci/conda_env_gandiva.txt \ /arrow/ci/ -# XXX(ARROW-17410,ARROW-17645): pin zlib due to bug in zlib 1.2.12 RUN mamba install -q -y \ --file arrow/ci/conda_env_cpp.txt \ --file arrow/ci/conda_env_gandiva.txt \ compilers \ doxygen \ - valgrind \ - zlib=1.2.11 && \ + valgrind && \ mamba clean --all # We want to install the GCS testbench using the same Python binary that the Conda code will use. diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index cce6a287f86..558f6bbf4dc 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -28,7 +28,6 @@ ARG go=1.15 # Install Archery and integration dependencies COPY ci/conda_env_archery.txt /arrow/ci/ -# Pin zlib to 1.2.11 due to ARROW-17410 until the patch is released RUN mamba install -q -y \ --file arrow/ci/conda_env_archery.txt \ "python>=3.7" \ @@ -37,8 +36,7 @@ RUN mamba install -q -y \ maven=${maven} \ nodejs=${node} \ yarn \ - openjdk=${jdk} \ - zlib=1.2.11 && \ + openjdk=${jdk} && \ mamba clean --all --force-pkgs-dirs # Install Rust with only the needed components From ffe60a21fc6c89a0628dce3a1c7c8622e25b6fd7 Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 12 Sep 2022 16:55:22 -0400 Subject: [PATCH 3/4] bump the cache? --- ci/docker/conda.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/conda.dockerfile b/ci/docker/conda.dockerfile index d0545e3bf84..0d6053e30a6 100644 --- a/ci/docker/conda.dockerfile +++ b/ci/docker/conda.dockerfile @@ -32,7 +32,7 @@ ENV PATH=/opt/conda/bin:$PATH # create a conda environment ADD ci/conda_env_unix.txt /arrow/ci/ -RUN mamba create -n arrow --file arrow/ci/conda_env_unix.txt git && \ +RUN mamba && mamba create -n arrow --file arrow/ci/conda_env_unix.txt git && \ mamba clean --all # activate the created environment by default From fad39d8c6b417c8747fbc52abfb9c39d8b4929a4 Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 12 Sep 2022 22:11:33 -0400 Subject: [PATCH 4/4] Revert "bump the cache?" This reverts commit ffe60a21fc6c89a0628dce3a1c7c8622e25b6fd7. --- ci/docker/conda.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/conda.dockerfile b/ci/docker/conda.dockerfile index 0d6053e30a6..d0545e3bf84 100644 --- a/ci/docker/conda.dockerfile +++ b/ci/docker/conda.dockerfile @@ -32,7 +32,7 @@ ENV PATH=/opt/conda/bin:$PATH # create a conda environment ADD ci/conda_env_unix.txt /arrow/ci/ -RUN mamba && mamba create -n arrow --file arrow/ci/conda_env_unix.txt git && \ +RUN mamba create -n arrow --file arrow/ci/conda_env_unix.txt git && \ mamba clean --all # activate the created environment by default