From 8e1e4473012735ce8695cac52316cf9ae717ffaa Mon Sep 17 00:00:00 2001 From: Vladislav Byrgazov <58589910+Ex4amp1e@users.noreply.github.com> Date: Mon, 27 May 2024 18:25:13 +0800 Subject: [PATCH] Check and resolve conflicts on PR creation (#1118) Signed-off-by: Vladislav Byrgazov Co-authored-by: Vladislav Byrgazov --- .github/workflows/pr-for-updates.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml index 86c9ea96..e6db1510 100644 --- a/.github/workflows/pr-for-updates.yaml +++ b/.github/workflows/pr-for-updates.yaml @@ -5,7 +5,28 @@ 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: 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 }}