mirror of https://github.com/vector-im/riot-web
Merge pull request #26949 from element-hq/t3chguy/saner-releases/yarn-lock
Saner Releases - ensure we set up staging branches in bottom-up orderpull/26953/head
commit
010d835d2c
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue