Ensure branches are cut bottom-up to avoid races for allchange

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/26949/head
Michael Telatynski 2024-01-31 15:25:08 +00:00
parent e6543bbde6
commit 145f551cd3
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
1 changed files with 5 additions and 6 deletions

View File

@ -25,6 +25,9 @@ on:
jobs:
prepare:
runs-on: ubuntu-latest
env:
# The order is specified bottom-up to avoid any races for allchange
REPOS: matrix-js-sdk matrix-react-sdk element-web element-desktop
steps:
- name: Checkout Element Desktop
uses: actions/checkout@v4
@ -67,15 +70,11 @@ jobs:
fetch-tags: true
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
- name: Resolve repos
run: |
echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
- name: Merge develop
run: |
git config --global user.email "releases@riot.im"
git config --global user.name "RiotRobot"
for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done
for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
- name: Push staging
run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done
run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done