From 350b84a1595c74a12bb38df007fef1e5799fdde0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 1 Oct 2024 13:54:32 +0100 Subject: [PATCH 1/2] Separate out tasks for each merge in the Prepare Release script So it's easier to see which one failed. --- .github/workflows/release_prepare.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 35cdc000e1..8d27d5227b 100644 --- a/.github/workflows/release_prepare.yml +++ b/.github/workflows/release_prepare.yml @@ -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 "releases@riot.im" git config --global user.name "RiotRobot" - for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done + git -C "element-desktop" merge origin/develop + - name: Merge Element Web + if: inputs.element-web + run: | + git config --global user.email "releases@riot.im" + 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 "releases@riot.im" + 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 "releases@riot.im" + git config --global user.name "RiotRobot" + 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 From 42be67e57ade05ba20e838dbbae3fab5d2e08e73 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 1 Oct 2024 14:06:03 +0100 Subject: [PATCH 2/2] Just run the git setup once --- .github/workflows/release_prepare.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml index 8d27d5227b..c021a0c3d3 100644 --- a/.github/workflows/release_prepare.yml +++ b/.github/workflows/release_prepare.yml @@ -70,29 +70,26 @@ jobs: fetch-tags: true token: ${{ secrets.ELEMENT_BOT_TOKEN }} - - name: Merge Element Desktop - if: inputs.element-desktop + - name: Prepare Git run: | git config --global user.email "releases@riot.im" git config --global user.name "RiotRobot" + + - name: Merge Element Desktop + if: inputs.element-desktop + run: | git -C "element-desktop" merge origin/develop - name: Merge Element Web if: inputs.element-web run: | - git config --global user.email "releases@riot.im" - 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 "releases@riot.im" - 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 "releases@riot.im" - git config --global user.name "RiotRobot" git -C "matrix-js-sdk" merge origin/develop - name: Push staging