Just run the git setup once

element-hq · Oct 1, 2024 · 42be67e · 42be67e
1 parent 350b84a
commit 42be67e
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
@@ -70,29 +70,26 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-            - name: Merge Element Desktop
-              if: inputs.element-desktop
+            - name: Prepare Git
               run: |
                   git config --global user.email "[email protected]"
                   git config --global user.name "RiotRobot"
+
+            - 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 config --global user.email "[email protected]"
-                  git config --global user.name "RiotRobot"
                   git -C "element-web" merge origin/develop
             - name: Merge React SDK
               if: inputs.matrix-react-sdk
               run: |
-                  git config --global user.email "[email protected]"
-                  git config --global user.name "RiotRobot"
                   git -C "matrix-react-sdk" merge origin/develop
             - name: Merge JS SDK
               if: inputs.matrix-js-sdk
               run: |
-                  git config --global user.email "[email protected]"
-                  git config --global user.name "RiotRobot"
                   git -C "matrix-js-sdk" merge origin/develop
 
             - name: Push staging