Separate out tasks for each merge in the Prepare Release script

So it's easier to see which one failed.
pull/28130/head
David Baker 2024-10-01 13:54:32 +01:00
parent e428a1eb53
commit 350b84a159
1 changed files with 21 additions and 2 deletions

View File

@ -70,11 +70,30 @@ jobs:
fetch-tags: true fetch-tags: true
token: ${{ secrets.ELEMENT_BOT_TOKEN }} token: ${{ secrets.ELEMENT_BOT_TOKEN }}
- name: Merge develop - name: Merge Element Desktop
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"
for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done 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 - name: Push staging
run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done