From e3b5516a7ae0e79d96f4a14b9282385a52e9d21a Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 31 Jan 2023 15:36:18 +0000
Subject: [PATCH 1/2] ci: Skip gitflow steps if no PR was created

---
 .github/workflows/gitflow-sync-develop.yml | 1 +
 .github/workflows/gitflow-sync-master.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/gitflow-sync-develop.yml b/.github/workflows/gitflow-sync-develop.yml
index 54fe0e5234b5..7b6241ccfbec 100644
--- a/.github/workflows/gitflow-sync-develop.yml
+++ b/.github/workflows/gitflow-sync-develop.yml
@@ -45,6 +45,7 @@ jobs:
       # https://github.com/marketplace/actions/auto-approve
       - name: Auto approve PR
         uses: hmarr/auto-approve-action@v3
+        if: steps.open-pr.outputs.pr_number != ''
         with:
           pull-request-number: ${{ steps.open-pr.outputs.pr_number }}
           review-message: 'Auto approved automated PR'
diff --git a/.github/workflows/gitflow-sync-master.yml b/.github/workflows/gitflow-sync-master.yml
index 9dbd6ca050e5..c60bf0666d29 100644
--- a/.github/workflows/gitflow-sync-master.yml
+++ b/.github/workflows/gitflow-sync-master.yml
@@ -47,6 +47,7 @@ jobs:
       # https://github.com/marketplace/actions/auto-approve
       - name: Auto approve PR
         uses: hmarr/auto-approve-action@v3
+        if: steps.open-pr.outputs.pr_number != ''
         with:
           pull-request-number: ${{ steps.open-pr.outputs.pr_number }}
           review-message: 'Auto approved automated PR'

From 800d4b82aec0875786112bcc914ed2691d8125aa Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 31 Jan 2023 16:29:10 +0000
Subject: [PATCH 2/2] ci: hard code branches

---
 .github/workflows/gitflow-sync-develop.yml | 10 ++++++----
 .github/workflows/gitflow-sync-master.yml  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/gitflow-sync-develop.yml b/.github/workflows/gitflow-sync-develop.yml
index 7b6241ccfbec..a63ab17b591e 100644
--- a/.github/workflows/gitflow-sync-develop.yml
+++ b/.github/workflows/gitflow-sync-develop.yml
@@ -11,7 +11,8 @@ on:
   workflow_dispatch:
 
 env:
-  DEV_BRANCH: develop
+  SOURCE_BRANCH: master
+  TARGET_BRANCH: develop
 
 jobs:
   main:
@@ -29,9 +30,10 @@ jobs:
         id: open-pr
         uses: repo-sync/pull-request@v2
         with:
-          destination_branch: ${{ env.DEV_BRANCH }}
-          pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.DEV_BRANCH }}'
-          pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.DEV_BRANCH }}'
+          source_branch: ${{ env.SOURCE_BRANCH }}
+          destination_branch: ${{ env.TARGET_BRANCH }}
+          pr_title: '[Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
+          pr_body: 'Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
           pr_label: 'Dev: Gitflow'
 
       # https://github.com/marketplace/actions/enable-pull-request-automerge
diff --git a/.github/workflows/gitflow-sync-master.yml b/.github/workflows/gitflow-sync-master.yml
index c60bf0666d29..8c54a8b4e183 100644
--- a/.github/workflows/gitflow-sync-master.yml
+++ b/.github/workflows/gitflow-sync-master.yml
@@ -13,7 +13,8 @@ on:
   workflow_dispatch:
 
 env:
-  MAIN_BRANCH: master
+  SOURCE_BRANCH: develop
+  TARGET_BRANCH: master
 
 jobs:
   main:
@@ -31,9 +32,10 @@ jobs:
         id: open-pr
         uses: repo-sync/pull-request@v2
         with:
-          destination_branch: ${{ env.MAIN_BRANCH }}
-          pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.MAIN_BRANCH }}'
-          pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.MAIN_BRANCH }}'
+          source_branch: ${{ env.SOURCE_BRANCH }}
+          destination_branch: ${{ env.TARGET_BRANCH }}
+          pr_title: '[Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
+          pr_body: 'Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
           pr_label: 'Dev: Gitflow'
 
       # https://github.com/marketplace/actions/enable-pull-request-automerge