Just run the git setup once

pull/28130/head
David Baker 2024-10-01 14:06:03 +01:00
parent 350b84a159
commit 42be67e57a
1 changed files with 5 additions and 8 deletions

View File

@ -70,29 +70,26 @@ jobs:
fetch-tags: true fetch-tags: true
token: ${{ secrets.ELEMENT_BOT_TOKEN }} token: ${{ secrets.ELEMENT_BOT_TOKEN }}
- name: Merge Element Desktop - name: Prepare Git
if: inputs.element-desktop
run: | run: |
git config --global user.email "releases@riot.im" git config --global user.email "releases@riot.im"
git config --global user.name "RiotRobot" git config --global user.name "RiotRobot"
- name: Merge Element Desktop
if: inputs.element-desktop
run: |
git -C "element-desktop" merge origin/develop git -C "element-desktop" merge origin/develop
- name: Merge Element Web - name: Merge Element Web
if: inputs.element-web if: inputs.element-web
run: | run: |
git config --global user.email "releases@riot.im"
git config --global user.name "RiotRobot"
git -C "element-web" merge origin/develop git -C "element-web" merge origin/develop
- name: Merge React SDK - name: Merge React SDK
if: inputs.matrix-react-sdk if: inputs.matrix-react-sdk
run: | run: |
git config --global user.email "releases@riot.im"
git config --global user.name "RiotRobot"
git -C "matrix-react-sdk" merge origin/develop git -C "matrix-react-sdk" merge origin/develop
- name: Merge JS SDK - name: Merge JS SDK
if: inputs.matrix-js-sdk if: inputs.matrix-js-sdk
run: | run: |
git config --global user.email "releases@riot.im"
git config --global user.name "RiotRobot"
git -C "matrix-js-sdk" merge origin/develop git -C "matrix-js-sdk" merge origin/develop
- name: Push staging - name: Push staging