From 7f17eb05bb455531664008f6c8128b36a0d48ea2 Mon Sep 17 00:00:00 2001 From: splincode Date: Fri, 27 Sep 2024 17:41:21 +0300 Subject: [PATCH] ci: revert --- .github/workflows/assign-author.yml | 5 ++--- .../{auto-merge-renovate-branch.yml => auto-merge.yml} | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) rename .github/workflows/{auto-merge-renovate-branch.yml => auto-merge.yml} (92%) diff --git a/.github/workflows/assign-author.yml b/.github/workflows/assign-author.yml index 59c2e5d1c..0f0a85fbb 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: @@ -9,9 +10,7 @@ jobs: - uses: actions/checkout@v4.2.0 - uses: taiga-family/ci/actions/setup/variables@v1.87.0 - uses: toshimaru/auto-author-assign@v2.1.1 - if: env.IS_OWNER_MODE == 'true' - with: - repo-token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }} + continue-on-error: true concurrency: group: ${{ github.workflow }}-${{ github.ref }} 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 }}