Try to workaround gdal-data corruption issue

.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}"

.buildkite/pipeline.yml

@@ -5,33 +5,26 @@ 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
 
   - block: "Release?"
     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

.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

.gitignore

@@ -170,3 +170,6 @@ gdal/share
 /build
 CMakeSettings.json
 out/
+
+# kx
+build-jammy