From 703dfbf41dd52cb44d80a5d32d08f7649f46bc0a Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:11:57 +0100 Subject: [PATCH 01/23] test sync --- .github/workflows/sync_develop_master.yml | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/sync_develop_master.yml diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml new file mode 100644 index 00000000000..8c1a5a5a686 --- /dev/null +++ b/.github/workflows/sync_develop_master.yml @@ -0,0 +1,38 @@ +name: master->develop Synchronizer + +on: + pull_request: + types: [opened, synchronize, reopened, labeled, unlabeled] + schedule: + - cron: '0 04 * * *' + +jobs: + automatic-branches-sync: + if: ${{ contains(github.event.pull_request.labels.*.name, 'test sync') }} + runs-on: ubuntu-latest + steps: + - name: Checkout branch + uses: actions/checkout@v3 + with: + submodules: "true" + fetch-depth: 0 + ref: master + - name: Check for diff + id: check-diff + run: | + if [ -n "$(git diff develop...master)" ]; then + echo "Develop needs sync with master!"; + echo "create_pull_request=1" >> $GITHUB_OUTPUT + else + echo "Develop is already up to date."; + echo "create_pull_request=0" >> $GITHUB_OUTPUT + - name: Create Pull Request if necessary + if: ${{ steps.check-diff.outputs.create_pull_request == 1 }} + uses: repo-sync/pull-request@v2.6.2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: ${{ env.master }} + destination_branch: ${{ env.develop }} + pr_title: Merge master into develop + pr_body: Synchronizes changes of master branch into develop branch. + pr_reviewer: Maintainers From af60b114be0a3607d9e087cfcf763b5a616e9361 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:15:27 +0100 Subject: [PATCH 02/23] minor fix --- .github/workflows/sync_develop_master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 8c1a5a5a686..b49d44b1342 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -26,6 +26,7 @@ jobs: else echo "Develop is already up to date."; echo "create_pull_request=0" >> $GITHUB_OUTPUT + fi - name: Create Pull Request if necessary if: ${{ steps.check-diff.outputs.create_pull_request == 1 }} uses: repo-sync/pull-request@v2.6.2 From 3fd792d35ddb87d88a7ed369064983b087e49494 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:16:38 +0100 Subject: [PATCH 03/23] remove checkout --- .github/workflows/sync_develop_master.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index b49d44b1342..cecf0a88a74 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -11,12 +11,6 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'test sync') }} runs-on: ubuntu-latest steps: - - name: Checkout branch - uses: actions/checkout@v3 - with: - submodules: "true" - fetch-depth: 0 - ref: master - name: Check for diff id: check-diff run: | From bde892ee535246d110c6db22895d041794723d9c Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:19:18 +0100 Subject: [PATCH 04/23] restore branch --- .github/workflows/sync_develop_master.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index cecf0a88a74..5561a1adb2a 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -11,6 +11,12 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'test sync') }} runs-on: ubuntu-latest steps: + - name: Checkout branch + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 1 + ref: master - name: Check for diff id: check-diff run: | From 60de3af6046fc208b932576f4b23ed516f9b79aa Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:20:11 +0100 Subject: [PATCH 05/23] Remove branch --- .github/workflows/sync_develop_master.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 5561a1adb2a..765daecb53d 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -16,7 +16,6 @@ jobs: with: submodules: true fetch-depth: 1 - ref: master - name: Check for diff id: check-diff run: | From 83700cf2eba0a1726d5f18b471977942256d1ea5 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:32:27 +0100 Subject: [PATCH 06/23] test --- .github/workflows/sync_develop_master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 765daecb53d..ddff16cfc20 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -19,7 +19,7 @@ jobs: - name: Check for diff id: check-diff run: | - if [ -n "$(git diff develop...master)" ]; then + if [ -n "$(git diff ${{ env.develop }}...${{ env.master }})" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT else From c7a1b22df380a82956b3c90d2d79e06c70aee6a2 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:35:12 +0100 Subject: [PATCH 07/23] test --- .github/workflows/sync_develop_master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index ddff16cfc20..17eea9e4cfb 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -19,6 +19,7 @@ jobs: - name: Check for diff id: check-diff run: | + echo ${{ env.develop }} if [ -n "$(git diff ${{ env.develop }}...${{ env.master }})" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT From 0f84fbacfc5cc1e926c5852881e8ca9c42f17e6b Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:41:19 +0100 Subject: [PATCH 08/23] test --- .github/workflows/sync_develop_master.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 17eea9e4cfb..7bf3e2c6bf6 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -19,8 +19,7 @@ jobs: - name: Check for diff id: check-diff run: | - echo ${{ env.develop }} - if [ -n "$(git diff ${{ env.develop }}...${{ env.master }})" ]; then + if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT else @@ -32,8 +31,8 @@ jobs: uses: repo-sync/pull-request@v2.6.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ env.master }} - destination_branch: ${{ env.develop }} + source_branch: master + destination_branch: develop pr_title: Merge master into develop pr_body: Synchronizes changes of master branch into develop branch. pr_reviewer: Maintainers From 5394021f89a7b587f2fe404793bf2418ab3a09bb Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:43:25 +0100 Subject: [PATCH 09/23] origin --- .github/workflows/sync_develop_master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 7bf3e2c6bf6..41770c5e98b 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -19,7 +19,7 @@ jobs: - name: Check for diff id: check-diff run: | - if [ -n "$(git diff develop...master)" ]; then + if [ -n "$(git diff origin/develop...origin/master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT else From 74cb16025fd7357f4d00a2db6e58f5aaac17c7cf Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:48:56 +0100 Subject: [PATCH 10/23] test --- .github/workflows/sync_develop_master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 41770c5e98b..5b9d76c6996 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -19,6 +19,7 @@ jobs: - name: Check for diff id: check-diff run: | + git branch if [ -n "$(git diff origin/develop...origin/master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT From a04ab0d95c10c58a88286ddd1caeab7913bc53af Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 14:55:28 +0100 Subject: [PATCH 11/23] test double checkout --- .github/workflows/sync_develop_master.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 5b9d76c6996..ddfd011b5a5 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -11,16 +11,22 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'test sync') }} runs-on: ubuntu-latest steps: - - name: Checkout branch + - name: Checkout master uses: actions/checkout@v3 with: submodules: true fetch-depth: 1 + ref: master + - name: Checkout develop + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 1 + ref: develop - name: Check for diff id: check-diff run: | - git branch - if [ -n "$(git diff origin/develop...origin/master)" ]; then + if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT else From 9877a9905cd7791f8616728c9b2181416542a3f2 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:00:54 +0100 Subject: [PATCH 12/23] checkout after --- .github/workflows/sync_develop_master.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index ddfd011b5a5..c346202f04e 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -17,15 +17,10 @@ jobs: submodules: true fetch-depth: 1 ref: master - - name: Checkout develop - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 1 - ref: develop - name: Check for diff id: check-diff run: | + git checkout origin/develop if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT From 7065d047cdecad26d1a7441f54f4a596c21c75f9 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:05:02 +0100 Subject: [PATCH 13/23] fetch develop --- .github/workflows/sync_develop_master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index c346202f04e..a011de3e9c5 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -20,7 +20,8 @@ jobs: - name: Check for diff id: check-diff run: | - git checkout origin/develop + git fetch origin develop --depth 1 + git branch if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT From 8475e5c0bb0ec277ffc131ce28ae1b16937206df Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:09:20 +0100 Subject: [PATCH 14/23] test --- .github/workflows/sync_develop_master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index a011de3e9c5..d5b7d4f24a7 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -20,7 +20,7 @@ jobs: - name: Check for diff id: check-diff run: | - git fetch origin develop --depth 1 + git pull origin develop --depth 1 git branch if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; From 62ab31c3e4cb863101be333bb9bf45246aac8738 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:31:31 +0100 Subject: [PATCH 15/23] test --- .github/workflows/sync_develop_master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index d5b7d4f24a7..ffff4a45e51 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -20,8 +20,8 @@ jobs: - name: Check for diff id: check-diff run: | - git pull origin develop --depth 1 - git branch + git fetch origin develop --depth 1 + git checkout develop if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; echo "create_pull_request=1" >> $GITHUB_OUTPUT From 68a260b9d227923d99ad9e422dbc7053a1795c73 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:35:11 +0100 Subject: [PATCH 16/23] change depth --- .github/workflows/sync_develop_master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index ffff4a45e51..68e22d09784 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -15,12 +15,12 @@ jobs: uses: actions/checkout@v3 with: submodules: true - fetch-depth: 1 + fetch-depth: 0 ref: master - name: Check for diff id: check-diff run: | - git fetch origin develop --depth 1 + git fetch origin develop git checkout develop if [ -n "$(git diff develop...master)" ]; then echo "Develop needs sync with master!"; From 20f985125ab75b74d0f079f1d33592121cb15120 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 15:51:51 +0100 Subject: [PATCH 17/23] Update title --- .github/workflows/sync_develop_master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 68e22d09784..276084b33d7 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -1,4 +1,4 @@ -name: master->develop Synchronizer +name: Synchronize Develop with Master on: pull_request: From 13d6c7e12f51f58eac382c75b26574b582862d2f Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 16:31:07 +0100 Subject: [PATCH 18/23] Add released with master --- .github/workflows/sync_develop_master.yml | 38 ++++++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 276084b33d7..18ed4d43916 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -1,14 +1,42 @@ -name: Synchronize Develop with Master +name: Branch synchronizer on: - pull_request: - types: [opened, synchronize, reopened, labeled, unlabeled] schedule: - cron: '0 04 * * *' jobs: - automatic-branches-sync: - if: ${{ contains(github.event.pull_request.labels.*.name, 'test sync') }} + sync-master-with-released: + runs-on: ubuntu-latest + steps: + - name: Checkout master + uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + ref: released + - name: Check for diff + id: check-diff + run: | + git fetch origin master + git checkout master + if [ -n "$(git diff master...released)" ]; then + echo "Master needs sync with released!"; + echo "create_pull_request=1" >> $GITHUB_OUTPUT + else + echo "Master is already up to date."; + echo "create_pull_request=0" >> $GITHUB_OUTPUT + fi + - name: Create Pull Request if necessary + if: ${{ steps.check-diff.outputs.create_pull_request == 1 }} + uses: repo-sync/pull-request@v2.6.2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: released + destination_branch: master + pr_title: Merge released into master + pr_body: Synchronizes changes of released branch into master branch. + pr_reviewer: Maintainers + sync-develop-with-master: runs-on: ubuntu-latest steps: - name: Checkout master From c944e6ba0ba2a0d586cc204499d34d381a60bed2 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 16:55:46 +0100 Subject: [PATCH 19/23] Allow empty develop PR if released in master --- .github/workflows/sync_develop_master.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 18ed4d43916..8fc79344ded 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -36,8 +36,12 @@ jobs: pr_title: Merge released into master pr_body: Synchronizes changes of released branch into master branch. pr_reviewer: Maintainers + pr_label: "synchronization" + outputs: + pr_opened: ${{ steps.check-diff.outputs.create_pull_request == 1 }} sync-develop-with-master: runs-on: ubuntu-latest + needs: sync-master-with-released steps: - name: Checkout master uses: actions/checkout@v3 @@ -58,7 +62,7 @@ jobs: echo "create_pull_request=0" >> $GITHUB_OUTPUT fi - name: Create Pull Request if necessary - if: ${{ steps.check-diff.outputs.create_pull_request == 1 }} + if: ${{ steps.check-diff.outputs.create_pull_request == 1 }} || ${{ needs.sync-master-with-released.outputs.pr_opened == 1 }} uses: repo-sync/pull-request@v2.6.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -67,3 +71,5 @@ jobs: pr_title: Merge master into develop pr_body: Synchronizes changes of master branch into develop branch. pr_reviewer: Maintainers + pr_label: "synchronization" + pr_allow_empty: true From aab8d3d865823971ceb24e03847049748c80b248 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 17:07:32 +0100 Subject: [PATCH 20/23] Remove wrong tab --- .github/workflows/sync_develop_master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 8fc79344ded..8c2d07ae3c4 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -37,8 +37,8 @@ jobs: pr_body: Synchronizes changes of released branch into master branch. pr_reviewer: Maintainers pr_label: "synchronization" - outputs: - pr_opened: ${{ steps.check-diff.outputs.create_pull_request == 1 }} + outputs: + pr_opened: ${{ steps.check-diff.outputs.create_pull_request == 1 }} sync-develop-with-master: runs-on: ubuntu-latest needs: sync-master-with-released From f1f61b41f7ede6c16e11e2c83340ea1a57557bf2 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 17:11:59 +0100 Subject: [PATCH 21/23] launch test --- .github/workflows/sync_develop_master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 8c2d07ae3c4..25299a8e81f 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -1,6 +1,8 @@ name: Branch synchronizer on: + pull_request: + types: [opened, synchronize, reopened, labeled, unlabeled] schedule: - cron: '0 04 * * *' From 2b1838b29fb09943dd0cebcc0524458eccdc73ac Mon Sep 17 00:00:00 2001 From: Yannick Goumaz Date: Mon, 21 Nov 2022 17:29:35 +0100 Subject: [PATCH 22/23] remove test in pull request --- .github/workflows/sync_develop_master.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 25299a8e81f..98f8bb87940 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -1,8 +1,6 @@ name: Branch synchronizer on: - pull_request: - types: [opened, synchronize, reopened, labeled, unlabeled] schedule: - cron: '0 04 * * *' @@ -10,7 +8,7 @@ jobs: sync-master-with-released: runs-on: ubuntu-latest steps: - - name: Checkout master + - name: Checkout released uses: actions/checkout@v3 with: submodules: true From 517436757aeaa6be99b3c46ad54707c213efb241 Mon Sep 17 00:00:00 2001 From: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Date: Tue, 22 Nov 2022 14:40:33 +0100 Subject: [PATCH 23/23] Update sync_develop_master.yml --- .github/workflows/sync_develop_master.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/sync_develop_master.yml b/.github/workflows/sync_develop_master.yml index 98f8bb87940..6accfea1711 100644 --- a/.github/workflows/sync_develop_master.yml +++ b/.github/workflows/sync_develop_master.yml @@ -36,7 +36,6 @@ jobs: pr_title: Merge released into master pr_body: Synchronizes changes of released branch into master branch. pr_reviewer: Maintainers - pr_label: "synchronization" outputs: pr_opened: ${{ steps.check-diff.outputs.create_pull_request == 1 }} sync-develop-with-master: @@ -71,5 +70,4 @@ jobs: pr_title: Merge master into develop pr_body: Synchronizes changes of master branch into develop branch. pr_reviewer: Maintainers - pr_label: "synchronization" pr_allow_empty: true