From 554c9e5dd806348bd9ce7f9595761a4824ccc8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 15 Sep 2026 14:20:50 +0200
Subject: [PATCH 1/4] GH-51343: [CI][Packaging] Re-enable diffoscope for
 debugging reproducible build failures

---
 .github/workflows/package_linux.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/package_linux.yml b/.github/workflows/package_linux.yml
index dd5d5a4eaf3..1627d3286b1 100644
--- a/.github/workflows/package_linux.yml
+++ b/.github/workflows/package_linux.yml
@@ -353,7 +353,6 @@ jobs:
           reprotest \
             --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"

From 582cfc6de434b26fad7c36a1b327a1a1eb8be959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 15 Sep 2026 14:21:28 +0200
Subject: [PATCH 2/4] Temporarily reduce matrix for debugging

---
 .github/workflows/package_linux.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/workflows/package_linux.yml b/.github/workflows/package_linux.yml
index 1627d3286b1..4b5d29035b1 100644
--- a/.github/workflows/package_linux.yml
+++ b/.github/workflows/package_linux.yml
@@ -92,26 +92,8 @@ jobs:
       fail-fast: false
       matrix:
         id:
-          - almalinux-8-amd64
-          - almalinux-8-arm64
-          - almalinux-9-amd64
-          - almalinux-9-arm64
-          - almalinux-10-amd64
-          - almalinux-10-arm64
-          - amazon-linux-2023-amd64
-          - amazon-linux-2023-arm64
-          - centos-9-stream-amd64
-          - centos-9-stream-arm64
           - debian-trixie-amd64
           - debian-trixie-arm64
-          - debian-forky-amd64
-          - debian-forky-arm64
-          - ubuntu-jammy-amd64
-          - ubuntu-jammy-arm64
-          - ubuntu-noble-amd64
-          - ubuntu-noble-arm64
-          - ubuntu-resolute-amd64
-          - ubuntu-resolute-arm64
     env:
       BUILD_DIR: "${{ github.workspace }}/packages.build"
     steps:

From dc36790801f448fd31ae5e6b67bbb651448b329f Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Wed, 16 Sep 2026 06:06:45 +0900
Subject: [PATCH 3/4] Show progress

---
 .github/workflows/package_linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/package_linux.yml b/.github/workflows/package_linux.yml
index 4b5d29035b1..ddf82adf427 100644
--- a/.github/workflows/package_linux.yml
+++ b/.github/workflows/package_linux.yml
@@ -335,6 +335,7 @@ jobs:
           reprotest \
             --build-command \
               "rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \
+            --diffoscope-arg "--exclude-directory-metadata=yes --progress" \
             --vary=-fileordering \
             "${PWD}" \
             "dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb"

From f380820555767440946ac7c274650bbfaf9ebd87 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Wed, 16 Sep 2026 15:10:37 +0900
Subject: [PATCH 4/4] Fix how to pass

---
 .github/workflows/package_linux.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/package_linux.yml b/.github/workflows/package_linux.yml
index ddf82adf427..53da214951d 100644
--- a/.github/workflows/package_linux.yml
+++ b/.github/workflows/package_linux.yml
@@ -335,7 +335,8 @@ jobs:
           reprotest \
             --build-command \
               "rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \
-            --diffoscope-arg "--exclude-directory-metadata=yes --progress" \
+            --diffoscope-arg --exclude-directory-metadata=yes \
+            --diffoscope-arg --progress \
             --vary=-fileordering \
             "${PWD}" \
             "dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb"