From 3a77eb99fc9c53bb9377209cb2056e0e16efd921 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   | 15 ++++-----------
 .buildkite/publish-deb.sh | 17 +++++++++++++++++
 .gitignore                |  3 +++
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100755 .buildkite/publish-deb.sh

diff --git a/.buildkite/build.sh b/.buildkite/build.sh
index 96cb6780bbe6..a1442fe98604 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-${BUILDKITE_JOB_ID}"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e5864231af29..ab83b20a9c1b 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
 
@@ -19,19 +19,12 @@ steps:
     prompt: "Release to archive?"
 
   - label: ":debian: Publish deb"
-    command:
-      - >
-        aptly-upload
-        --aptly-url https://apt-repo.kx.gd
-        --retries 3
-        --repo kx-builds-jammy
-        --series jammy
-        build-jammy/*.deb
+    command: ".buildkite/publish-deb.sh"
     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
diff --git a/.buildkite/publish-deb.sh b/.buildkite/publish-deb.sh
new file mode 100755
index 000000000000..2a081614b2ad
--- /dev/null
+++ b/.buildkite/publish-deb.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# 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 collated
+for dir in build-*; do
+    echo "$dir"
+    mv "$dir"/*.deb collated/
+done
+
+aptly-upload \
+    --aptly-url https://apt-repo.kx.gd \
+    --retries 3 \
+    --repo kx-builds-jammy \
+    --series jammy \
+    collated/*.deb
diff --git a/.gitignore b/.gitignore
index 7affe99ad95f..5bb7b3d71df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,6 @@ gdal/share
 /build
 CMakeSettings.json
 out/
+
+# kx
+build-jammy