diff --git a/.github/renovate.json b/.github/renovate.json index bf23f4917..ea97408fa 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,4 +1,5 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["github>taiga-family/renovate-config"] + "extends": ["github>taiga-family/renovate-config"], + "automerge": true } diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index ebb8e3310..153fe942c 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -1,16 +1,43 @@ -name: πŸ€– Auto approve by bot +name: πŸ€– Auto approve validation on: pull_request +env: + JOBS_NAME: '[ "Build package", "Build demo", "Lint", "Tests", "E2E result" ]' + jobs: - automated-pull-request: + setup: runs-on: ubuntu-latest - permissions: - pull-requests: write + outputs: + matrix: ${{ steps.matrix.outputs.value }} steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 - uses: taiga-family/ci/actions/setup/variables@v1.23.0 - - uses: taiga-family/ci/actions/auto/approve/double@v1.23.0 + - id: matrix if: env.TAIGA_FAMILY_BOT_IS_AUTHOR == 'true' + run: echo "value=$JOBS_NAME" >> $GITHUB_OUTPUT + + wait: + needs: [setup] + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + value: ${{ fromJSON(needs.setup.outputs.matrix) }} + steps: + - uses: taiga-family/ci/actions/run/wait-job@v1.24.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + job: ${{ matrix.value }} + + approve: + needs: [wait] + runs-on: ubuntu-latest + steps: + - uses: taiga-family/ci/actions/auto/approve/double@v1.23.0 with: token1: ${{ secrets.GITHUB_TOKEN }} token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }} + +concurrency: + group: auto-approve-${{ github.head_ref }} + cancel-in-progress: true diff --git a/.github/workflows/auto-wait-successful.yml b/.github/workflows/auto-wait-successful.yml deleted file mode 100644 index 653fb5d6d..000000000 --- a/.github/workflows/auto-wait-successful.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: πŸ€– Auto approve when success - -on: - workflow_run: - workflows: ['βš™οΈ Build demo', 'βš™οΈ Build lib', 'βš™οΈ Lint', 'βš™οΈ Tests'] - types: - - completed - -jobs: - on-success: - runs-on: ubuntu-latest - steps: - - run: echo 'The triggering workflow passed' - - run: echo '${{ github.event.workflow_run.conclusion }}' - - run: echo '${{ github.ref }}' - - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 - - uses: taiga-family/ci/actions/setup/variables@v1.23.0 - - uses: taiga-family/ci/actions/auto/approve/double@v1.23.0 - if: env.TAIGA_FAMILY_BOT_IS_AUTHOR == 'true' - with: - token1: ${{ secrets.GITHUB_TOKEN }} - token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }} - - on-failure: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'failure' && github.ref != 'refs/heads/main' }} - steps: - - run: echo 'The triggering workflow failed' - - uses: actions/github-script@v5 - continue-on-error: true - with: - github-token: ${{ github.token }} - script: | - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: 'β›” Some workflows failed, we can’t use auto approve for here!' - }) diff --git a/.github/workflows/build-demo.yml b/.github/workflows/build-demo.yml index fece4f74f..b1726e445 100644 --- a/.github/workflows/build-demo.yml +++ b/.github/workflows/build-demo.yml @@ -6,7 +6,8 @@ on: - main jobs: - build: + build-demo: + name: Build demo runs-on: ubuntu-latest steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9319b841d..5236faf6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,8 @@ on: jobs: build: + name: Build package runs-on: ubuntu-latest - name: Build libs steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 - uses: taiga-family/ci/actions/setup/variables@v1.23.0 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d5468ce54..ac319290b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,6 +1,6 @@ name: βš™οΈ E2E on: - workflow_dispatch: + pull_request: env: CYPRESS_failOnSnapshotDiff: 0 @@ -8,7 +8,7 @@ env: jobs: build-demo: - name: Build demo + name: Build demo for cypress runs-on: ubuntu-latest steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d4e6e9211..60ba7d664 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,7 @@ on: jobs: lint: + name: Lint runs-on: ubuntu-latest steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f437ec00e..bfbb59ed6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ on: jobs: tests: - name: Unit tests + name: Tests runs-on: ubuntu-latest steps: - uses: taiga-family/ci/actions/setup/checkout@v1.23.0