Merge pull request #28130 from element-hq/dbkr/branch_cut_debug_2

Separate out tasks for each merge in the Prepare Release script
element-hq · Oct 1, 2024 · 3f1a321 · 3f1a321
2 parents e428a1e + 42be67e
commit 3f1a321
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
@@ -70,11 +70,27 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-            - name: Merge develop
+            - name: Prepare Git
               run: |
                   git config --global user.email "[email protected]"
                   git config --global user.name "RiotRobot"
-                  for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
+
+            - name: Merge Element Desktop
+              if: inputs.element-desktop
+              run: |
+                  git -C "element-desktop" merge origin/develop
+            - name: Merge Element Web
+              if: inputs.element-web
+              run: |
+                  git -C "element-web" merge origin/develop
+            - name: Merge React SDK
+              if: inputs.matrix-react-sdk
+              run: |
+                  git -C "matrix-react-sdk" merge origin/develop
+            - name: Merge JS SDK
+              if: inputs.matrix-js-sdk
+              run: |
+                  git -C "matrix-js-sdk" merge origin/develop
 
             - name: Push staging
               run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done