From 664bd6e5b7bc146e1499523a9852fbdde91b4691 Mon Sep 17 00:00:00 2001 From: Nikita Barsukov Date: Wed, 27 Dec 2023 16:52:46 +0300 Subject: [PATCH] ci: refactor skipped jobs to collapse successful job report --- .github/workflows/auto-approve.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index b14efdeec..96074974f 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -14,7 +14,6 @@ jobs: - uses: taiga-family/ci/actions/setup/checkout@v1.50.2 - uses: taiga-family/ci/actions/setup/variables@v1.50.2 - id: matrix - if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true' run: | if [[ "${{ env.IS_RELEASE_BRANCH }}" == "false" ]]; then echo "value=$PR_JOBS_NAME" >> $GITHUB_OUTPUT @@ -42,11 +41,12 @@ jobs: - uses: taiga-family/ci/actions/setup/checkout@v1.50.2 - uses: taiga-family/ci/actions/setup/variables@v1.50.2 - uses: taiga-family/ci/actions/auto/approve/double@v1.50.2 + if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true' with: token1: ${{ secrets.GITHUB_TOKEN }} token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }} - uses: taiga-family/ci/actions/run/merge@v1.50.2 - if: env.IS_RELEASE_BRANCH == 'false' + if: ${{ env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true' && env.IS_RELEASE_BRANCH == 'false' }} with: token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}