From 7ce9b4ed855fbad8f3ce397271afdf24514affc2 Mon Sep 17 00:00:00 2001
From: Craig de Stigter <craig@destigter.nz>
Date: Thu, 18 Apr 2024 16:31:53 +1200
Subject: [PATCH] Try to workaround gdal-data corruption issue

---
 .buildkite/build.sh     |  2 ++
 .buildkite/pipeline.yml | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.buildkite/build.sh b/.buildkite/build.sh
index 96cb6780bbe6..15cb72aa6aab 100755
--- a/.buildkite/build.sh
+++ b/.buildkite/build.sh
@@ -57,3 +57,5 @@ time docker run \
   -w "/src" \
   "${ECR}/ci-tools:latest" \
   sign-debs "/src/build-jammy/*.deb"
+
+mv build-jammy "build-$(dpkg --print-architecture)"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e5864231af29..5eafaa6ff3df 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,13 +5,13 @@ steps:
       - label: "build package (amd64)"
         command: ".buildkite/build.sh"
         artifact_paths:
-          - "build-jammy/*"
+          - "build-*/*"
         agents:
           queue: default
       - label: "build package (arm64)"
         command: ".buildkite/build.sh"
         artifact_paths:
-          - "build-jammy/*"
+          - "build-*/*"
         agents:
           queue: default_arm64
 
@@ -20,18 +20,24 @@ steps:
 
   - label: ":debian: Publish deb"
     command:
+      # attempt to work around gdal-data deb getting corrupted when we download
+      # two of them from the two arch builds at the same time.
+      # This is a likely bug in buildkite agent
+      # TODO: ticket it
+      - mkdir build-collated
+      - mv build-*/*.deb build-collated/
       - >
         aptly-upload
         --aptly-url https://apt-repo.kx.gd
         --retries 3
         --repo kx-builds-jammy
         --series jammy
-        build-jammy/*.deb
+        build-collated/*.deb
     retry:
       automatic: true
     plugins:
       artifacts#v1.2.0:
-        download: "build-jammy/*.deb"
+        download: "build-*/*.deb"
       docker#v1.4.0:
         image: "${ECR}/ci-tools"
         always-pull: true