-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate out tasks for each merge in the Prepare Release script
So it's easier to see which one failed.
- Loading branch information
Showing
1 changed file
with
21 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|