From 38dbedcd85ecc749fdc512afe4ae752eb511ec5a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Mar 2024 11:25:38 +0000
Subject: [PATCH] Fix deploying develop when the bundles are already present in
 R2 (#27200)

---
 .github/workflows/build_develop.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index e97165edb0..13acfef761 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -84,6 +84,13 @@ jobs:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
 
+            # We may be trying to deploy the same webapp bundles again, we need to ensure that the live bundles
+            # are not present in the _redirects file and instead accessed directly from Cloudflare Pages.
+            - name: Trim _redirects
+              working-directory: _deploy
+              run: |
+                  find bundles -type d -mindepth 1 -maxdepth 1 -exec sed -i "\:{}:d" _redirects \;
+
             - name: Wait for other steps to succeed
               uses: t3chguy/wait-on-check-action@05861d3a448898eb33dfce34153bd1ecb9422fb9 # fork
               with: