Merge pull request #26949 from element-hq/t3chguy/saner-releases/yarn-lock

Saner Releases - ensure we set up staging branches in bottom-up order
pull/26953/head
Michael Telatynski 2024-02-01 11:25:55 +00:00 committed by GitHub
commit 010d835d2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions

View File

@ -25,6 +25,9 @@ on:
jobs: jobs:
prepare: prepare:
runs-on: ubuntu-latest 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: steps:
- name: Checkout Element Desktop - name: Checkout Element Desktop
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -67,15 +70,11 @@ jobs:
fetch-tags: true fetch-tags: true
token: ${{ secrets.ELEMENT_BOT_TOKEN }} token: ${{ secrets.ELEMENT_BOT_TOKEN }}
- name: Resolve repos
run: |
echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
- name: Merge develop - name: Merge develop
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 git -C "$REPO" merge origin/develop; done for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
- name: Push staging - 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