From 03dadac6051aba6401bc19f7d3e89ded9572a973 Mon Sep 17 00:00:00 2001 From: splincode Date: Thu, 31 Aug 2023 16:26:56 +0300 Subject: [PATCH] feat: add new variable `TAIGA_FAMILY_BOT_IS_AUTHOR` --- .github/workflows/auto-approve.yml | 5 +++-- README.md | 6 +++--- actions/variables/action.yml | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 6ca6207..245c783 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -6,10 +6,11 @@ jobs: runs-on: ubuntu-latest permissions: pull-requests: write - if: github.actor == 'taiga-family-bot' && contains(github.head_ref, 'renovate/') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.6.0 + - uses: ./actions/variables - uses: ./actions/two-approve + if: env.TAIGA_FAMILY_BOT_IS_AUTHOR == 'true' with: token1: ${{ secrets.GITHUB_TOKEN }} token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }} diff --git a/README.md b/README.md index b8955f3..d69521e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ jobs: pull-requests: write if: contains(github.head_ref, 'release/') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.6.0 - uses: taiga-family/ci/actions/two-approve@1.3.0 with: token1: ${{ secrets.APPROVER1_TOKEN }} @@ -31,7 +31,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.6.0 - uses: taiga-family/ci/actions/variables@1.3.0 ``` @@ -42,6 +42,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.6.0 - uses: taiga-family/ci/actions/setup-node@1.3.0 ``` diff --git a/actions/variables/action.yml b/actions/variables/action.yml index 2f87b4b..1a9d3f8 100644 --- a/actions/variables/action.yml +++ b/actions/variables/action.yml @@ -45,6 +45,7 @@ runs: export SNAPSHOTS_CACHE_KEY="e2e-cache--${{ github.event.pull_request.head.sha || github.sha }}-${{ github.event.number }}" export CYPRESS_SNAPSHOTS_ARTIFACTS_KEY="cypress-e2e-artifacts--${{ github.event.pull_request.head.sha || github.sha }}-${{ github.run_id }}-${{ github.event.number }}" export PLAYWRIGHT_SNAPSHOTS_ARTIFACTS_KEY="playwright-e2e-artifacts--${{ github.event.pull_request.head.sha || github.sha }}-${{ github.run_id }}-${{ github.event.number }}" + export TAIGA_FAMILY_BOT_IS_AUTHOR="${{ github.actor == 'taiga-family-bot' && (contains(github.head_ref, 'release/') || contains(github.head_ref, 'renovate/')) }}" if [[ "$IS_FORK" == "false" && "$IS_DEPENDABOT" == "false" ]]; then export IS_OWNER_MODE="true" @@ -78,3 +79,4 @@ runs: echo "CYPRESS_SNAPSHOTS_ARTIFACTS_KEY=$CYPRESS_SNAPSHOTS_ARTIFACTS_KEY" >> $GITHUB_ENV echo "PLAYWRIGHT_SNAPSHOTS_ARTIFACTS_KEY=$PLAYWRIGHT_SNAPSHOTS_ARTIFACTS_KEY" >> $GITHUB_ENV echo "SNAPSHOTS_CACHE_KEY=$SNAPSHOTS_CACHE_KEY" >> $GITHUB_ENV + echo "TAIGA_FAMILY_BOT_IS_AUTHOR=$TAIGA_FAMILY_BOT_IS_AUTHOR" >> $GITHUB_ENV