Skip to content

Commit

Permalink
Separate out tasks for each merge in the Prepare Release script
Browse files Browse the repository at this point in the history
So it's easier to see which one failed.
  • Loading branch information
dbkr committed Oct 1, 2024
1 parent e428a1e commit 350b84a
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions .github/workflows/release_prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,30 @@ jobs:
fetch-tags: true
token: ${{ secrets.ELEMENT_BOT_TOKEN }}

- name: Merge develop
- name: Merge Element Desktop
if: inputs.element-desktop
run: |
git config --global user.email "[email protected]"
git config --global user.name "RiotRobot"
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"
for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
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
Expand Down

0 comments on commit 350b84a

Please sign in to comment.