From 96e6b91364dc15603628907c85f728e699ce1190 Mon Sep 17 00:00:00 2001 From: Vladislav Byrgazov Date: Mon, 27 May 2024 12:16:07 +0500 Subject: [PATCH 1/3] Check and resolve conflicts on PR creation Signed-off-by: Vladislav Byrgazov --- .github/workflows/pr-for-updates.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml index 86c9ea96..1ea2e12c 100644 --- a/.github/workflows/pr-for-updates.yaml +++ b/.github/workflows/pr-for-updates.yaml @@ -9,3 +9,18 @@ jobs: uses: networkservicemesh/.github/.github/workflows/pr-for-updates.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} + + check-mergeability: + needs: [ auto-pull-request ] + uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main + secrets: + token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} + + resolve_conflicts: + needs: [ check-mergeability ] + if: ${{ always() && needs.check-mergeability.result == 'failure' && needs.check-mergeability.outputs.pr_branch_ref != '' }} + uses: networkservicemesh/.github/.github/workflows/resolve-conflicts.yaml@main + with: + pr_branch_ref: ${{ needs.check-mergeability.outputs.pr_branch_ref }} + secrets: + token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} From 4825d4769ecb645118af68f3e56f8fb9a8ee17f1 Mon Sep 17 00:00:00 2001 From: Vladislav Byrgazov Date: Mon, 27 May 2024 12:33:06 +0500 Subject: [PATCH 2/3] Fix lint Signed-off-by: Vladislav Byrgazov --- .github/workflows/pr-for-updates.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml index 1ea2e12c..e26e93db 100644 --- a/.github/workflows/pr-for-updates.yaml +++ b/.github/workflows/pr-for-updates.yaml @@ -11,13 +11,13 @@ jobs: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} check-mergeability: - needs: [ auto-pull-request ] + needs: [auto-pull-request] uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} resolve_conflicts: - needs: [ check-mergeability ] + needs: [check-mergeability] if: ${{ always() && needs.check-mergeability.result == 'failure' && needs.check-mergeability.outputs.pr_branch_ref != '' }} uses: networkservicemesh/.github/.github/workflows/resolve-conflicts.yaml@main with: From f88be3856a3e46dba54efd93e629b7e1e8de2019 Mon Sep 17 00:00:00 2001 From: Vladislav Byrgazov Date: Mon, 27 May 2024 14:58:17 +0500 Subject: [PATCH 3/3] Added print-debug-info Signed-off-by: Vladislav Byrgazov --- .github/workflows/pr-for-updates.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml index e26e93db..e6db1510 100644 --- a/.github/workflows/pr-for-updates.yaml +++ b/.github/workflows/pr-for-updates.yaml @@ -5,6 +5,12 @@ on: branches: - update/** jobs: + print-debug-info: + name: Print debug info + runs-on: ubuntu-latest + steps: + - uses: hmarr/debug-action@v2 + auto-pull-request: uses: networkservicemesh/.github/.github/workflows/pr-for-updates.yaml@main secrets: