diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 8d27d5227bd..c021a0c3d3f 100644 --- 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 "releases@riot.im" 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 "releases@riot.im" - 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 "releases@riot.im" - 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 "releases@riot.im" - git config --global user.name "RiotRobot" git -C "matrix-js-sdk" merge origin/develop - name: Push staging