This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new f39939e31d8 GH-51217: [CI][Packaging] Don't use diffoscope (#51221)
f39939e31d8 is described below
commit f39939e31d8e85d5f8204fc2b14d1ccd707fcac2
Author: Sutou Kouhei <[email protected]>
AuthorDate: Wed Sep 9 10:50:56 2026 +0900
GH-51217: [CI][Packaging] Don't use diffoscope (#51221)
### Rationale for this change
`reprotest` step is flaky. It seems that it's killed by OOM (out-of-memory).
### What changes are included in this PR?
It seems that `diffoscope` is heavy. Disable it.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
No.
* GitHub Issue: #51217
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
.github/workflows/package_linux.yml | 3 +-
.../apt/debian-bookworm/Dockerfile | 41 ----------------------
.../apt/debian-forky/Dockerfile | 1 +
.../apt/debian-trixie/Dockerfile | 1 +
.../apt/ubuntu-jammy/Dockerfile | 1 +
.../apt/ubuntu-noble/Dockerfile | 1 +
.../apt/ubuntu-resolute/Dockerfile | 1 +
.../apache-arrow/apt/debian-forky/Dockerfile | 1 +
.../apache-arrow/apt/debian-trixie/Dockerfile | 1 +
.../apache-arrow/apt/ubuntu-jammy/Dockerfile | 1 +
.../apache-arrow/apt/ubuntu-noble/Dockerfile | 1 +
.../apache-arrow/apt/ubuntu-resolute/Dockerfile | 1 +
12 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/package_linux.yml
b/.github/workflows/package_linux.yml
index d7054fdb97c..dd5d5a4eaf3 100644
--- a/.github/workflows/package_linux.yml
+++ b/.github/workflows/package_linux.yml
@@ -351,9 +351,10 @@ jobs:
# inside its own tempdir and doesn't copy artifacts back,
# so this is purely a verification step.
reprotest \
- --vary=-fileordering \
--build-command \
"rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \
+ --no-diffoscope \
+ --vary=-fileordering \
"${PWD}" \
"dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb"
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile
deleted file mode 100644
index 5251b18f59e..00000000000
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-FROM debian:bookworm
-
-RUN \
- echo "debconf debconf/frontend select Noninteractive" | \
- debconf-set-selections
-
-RUN \
- echo 'APT::Install-Recommends "false";' > \
- /etc/apt/apt.conf.d/disable-install-recommends
-
-ARG DEBUG
-
-RUN \
- quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
- apt update ${quiet} && \
- apt install -y -V ${quiet} \
- build-essential \
- debhelper \
- devscripts \
- fakeroot \
- gnupg \
- libfaketime \
- lsb-release && \
- apt clean
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile
index 10295623ebe..7b71b7ae66a 100644
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile
@@ -38,5 +38,6 @@ RUN \
fakeroot \
gnupg \
libfaketime \
+ locales-all \
lsb-release && \
apt clean
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
index e52c81360f5..aae99ea8d48 100644
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
@@ -38,5 +38,6 @@ RUN \
fakeroot \
gnupg \
libfaketime \
+ locales-all \
lsb-release && \
apt clean
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile
index f16898d3126..ac0c61c4189 100644
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile
@@ -37,6 +37,7 @@ RUN \
fakeroot \
gnupg \
libfaketime \
+ locales-all \
lsb-release && \
apt clean && \
rm -rf /var/lib/apt/lists/*
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile
index 5af76d13e34..42c6652d198 100644
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile
@@ -37,6 +37,7 @@ RUN \
fakeroot \
gnupg \
libfaketime \
+ locales-all \
lsb-release && \
apt clean && \
rm -rf /var/lib/apt/lists/*
diff --git
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile
index 25f750891a8..68a5b1bcd79 100644
---
a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile
+++
b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile
@@ -37,6 +37,7 @@ RUN \
fakeroot \
gnupg \
libfaketime \
+ locales-all \
lsb-release && \
apt clean && \
rm -rf /var/lib/apt/lists/*
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile
index 5cea3ceb7dd..674e16d705a 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile
@@ -71,6 +71,7 @@ RUN \
libxxhash-dev \
libzstd-dev \
llvm-dev \
+ locales-all \
lsb-release \
meson \
ninja-build \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
index b51d7d5f9e7..2c992768418 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
@@ -71,6 +71,7 @@ RUN \
libxxhash-dev \
libzstd-dev \
llvm-dev \
+ locales-all \
lsb-release \
meson \
ninja-build \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
index 55203d862f5..644bc695bbd 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
@@ -63,6 +63,7 @@ RUN \
libxxhash-dev \
libzstd-dev \
llvm-dev \
+ locales-all \
lsb-release \
meson \
mold \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile
index c1830cb426f..496609a8925 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile
@@ -64,6 +64,7 @@ RUN \
libxxhash-dev \
libzstd-dev \
llvm-dev \
+ locales-all \
lsb-release \
meson \
mold \
diff --git
a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile
index 322cf237395..19f1434b7f6 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile
@@ -64,6 +64,7 @@ RUN \
libxxhash-dev \
libzstd-dev \
llvm-dev \
+ locales-all \
lsb-release \
meson \
mold \
