From 6120e674eefd08090e6da8e76e0f184eea1b0cc8 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Mon, 6 Feb 2023 17:25:37 -0500
Subject: [PATCH] we're cleaning up artifact staging too aggressively

---
 .github/workflows/bottle.yml | 28 ++++------------------------
 .github/workflows/cd.yml     | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml
index afc90d00..ba11caf3 100644
--- a/.github/workflows/bottle.yml
+++ b/.github/workflows/bottle.yml
@@ -10,6 +10,10 @@ on:
       platform:
         required: true
         type: string
+    outputs:
+      pr:
+        description: 'The PR number'
+        value: ${{ jobs.bottle.outputs.pr }}
 
 jobs:
   get-platform:
@@ -214,30 +218,6 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
-  cleanup:
-    runs-on: ubuntu-latest
-    needs: [bottle, upload]
-    if: ${{ !inputs.new-version }}
-    steps:
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-      - run: |
-          REPO=$(echo ${{github.repository}} | sed -e 's_teaxyz/__')
-
-          if test -z "$PR"; then
-            echo "no PR to clean up"
-            exit 0
-          fi
-
-          aws s3 rm --recursive s3://$AWS_S3_CACHE/pull-request/$REPO/$PR
-        env:
-          AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }}
-          PR: ${{ needs.bottle.outputs.pr }}
-
   complain:
     needs: [upload]
     if: inputs.new-version == 'true' && failure()
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 317bb851..9c93fb1d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -42,6 +42,31 @@ jobs:
     with:
       platform: ${{ matrix.platform }}
     secrets: inherit
+  cleanup:
+    needs: [bottle-pr]
+    runs-on: ubuntu-latest
+    if: ${{ needs.cd.outputs.HAS_ARTIFACTS == 'true' }}
+    env:
+      PR: ${{ needs.bottle.outputs.pr }}
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+      - run: |
+          REPO=$(echo ${{github.repository}} | sed -e 's_teaxyz/__')
+
+          if test -z "$PR"; then
+            echo "no PR to clean up"
+            exit 0
+          fi
+
+          aws s3 rm --recursive s3://$AWS_S3_CACHE/pull-request/$REPO/$PR
+        env:
+          AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }}
+          PR: ${{ needs.bottle.outputs.pr }}
   bottle-standalone:
     runs-on: ubuntu-latest
     needs: [cd]