From b977dfdb436c5497e7f9fff9bf566debc7c7b1a4 Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Mon, 27 Jan 2025 09:27:45 +0100
Subject: [PATCH 1/2] ci(gocd): Upload missing gocd artifacts

---
 .github/workflows/image.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 3aa111774..38d975450 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -104,6 +104,43 @@ jobs:
           docker push "$NIGHTLY_IMG_CACHE"
           docker push "$IMG_VERSIONED"
 
+  gocd-artifacts:
+    needs: [build-setup, build-image]
+    if: "needs.build-setup.outputs.full_ci == 'true'"
+
+    name: Upload gocd artifacts
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      id-token: write
+
+    env:
+      GHCR_IMAGE: ghcr.io/getsentry/symbolicator:amd64-${{ github.sha }}
+
+    steps:
+      - name: Google Auth
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
+          service_account: gha-gcr-push@sac-prod-sa.iam.gserviceaccount.com
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+        with:
+          version: ">= 390.0.0"
+
+      - name: Upload gocd deployment assets
+        run: |
+          set -euxo pipefail
+
+          docker run --rm --entrypoint cat "${GHCR_IMAGE}" /opt/symbolicator-debug.zip > symbolicator-debug.zip
+          docker run --rm --entrypoint cat "${GHCR_IMAGE}" /opt/symbolicator.src.zip > symbolicator.src.zip
+
+          gsutil -m cp ./symbolicator-debug.zip ./symbolicator.src.zip \
+            gs://dicd-team-devinfra-cd--symbolicator/difs/${{ github.sha }}/
+
   assemble:
     needs: [build-setup, build-image]
     if: "needs.build-setup.outputs.full_ci == 'true'"

From d147b17210ccf70b72d2a72764da2559b90f10dc Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Mon, 27 Jan 2025 09:55:16 +0100
Subject: [PATCH 2/2] use artifacts

---
 .github/workflows/image.yml | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 38d975450..b2663f93e 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -97,6 +97,21 @@ jobs:
               --cache-from "${NIGHTLY_IMG_CACHE}" \
               .
 
+      - name: Prepare Artifacts
+        if: "needs.build-setup.outputs.full_ci == 'true'"
+        run: |
+          mkdir -p "artifacts/${{ matrix.arch }}"
+
+          docker run --rm --entrypoint cat "${BUILDER_IMG_CACHE}" /opt/symbolicator-debug.zip > artifacts/symbolicator-debug.zip
+          docker run --rm --entrypoint cat "${BUILDER_IMG_CACHE}" /opt/symbolicator.src.zip > artifacts/symbolicator.src.zip
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 1
+          name: image-${{ matrix.arch }}
+          path: "./artifacts/*"
+
       - name: push all images
         if: "needs.build-setup.outputs.full_ci == 'true'"
         run: |
@@ -131,15 +146,13 @@ jobs:
         with:
           version: ">= 390.0.0"
 
-      - name: Upload gocd deployment assets
-        run: |
-          set -euxo pipefail
-
-          docker run --rm --entrypoint cat "${GHCR_IMAGE}" /opt/symbolicator-debug.zip > symbolicator-debug.zip
-          docker run --rm --entrypoint cat "${GHCR_IMAGE}" /opt/symbolicator.src.zip > symbolicator.src.zip
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: "image-amd64"
+          merge-multiple: true
 
-          gsutil -m cp ./symbolicator-debug.zip ./symbolicator.src.zip \
-            gs://dicd-team-devinfra-cd--symbolicator/difs/${{ github.sha }}/
+      - name: Upload gocd deployment assets
+        run: gsutil -m cp ./symbolicator*.zip "gs://dicd-team-devinfra-cd--symbolicator/difs/${{ github.sha }}/"
 
   assemble:
     needs: [build-setup, build-image]