diff --git a/.github/workflows/assign-author.yml b/.github/workflows/assign-author.yml index 59c2e5d1c..5abeb7382 100644 --- a/.github/workflows/assign-author.yml +++ b/.github/workflows/assign-author.yml @@ -1,6 +1,7 @@ name: 🤖 PR author as an assignee on: pull_request: + types: [opened] jobs: assign: diff --git a/.github/workflows/auto-merge-renovate-branch.yml b/.github/workflows/auto-merge.yml similarity index 92% rename from .github/workflows/auto-merge-renovate-branch.yml rename to .github/workflows/auto-merge.yml index e1a1a3df7..6e86313fd 100644 --- a/.github/workflows/auto-merge-renovate-branch.yml +++ b/.github/workflows/auto-merge.yml @@ -38,10 +38,12 @@ jobs: - uses: actions/checkout@v4.2.0 - uses: taiga-family/ci/actions/setup/variables@v1.87.0 - uses: taiga-family/ci/actions/auto/approve/double@v1.87.0 + 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.87.0 + if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true' with: token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}