diff options
| author | Pierre Ozoux <pierre@ozoux.net> | 2022-06-01 19:28:40 +0300 |
|---|---|---|
| committer | Pierre Ozoux <pierre@ozoux.net> | 2022-06-01 19:30:41 +0300 |
| commit | 216e8bcfe46df31c46a655951e21860fcc9957c8 (patch) | |
| tree | 18348df7694df5a03fbc0a017f78d849c4514fef | |
| parent | 1b35a86c36ae4b116bef747b29091d56c4a844a5 (diff) | |
Another attempt to fix l10n bot.another-attempt-fix-l10n-bot
Signed-off-by: Pierre Ozoux <pierre@ozoux.net>
| -rw-r--r-- | .github/workflows/generate_catalog_templates.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/transifex.yml | 6 |
2 files changed, 17 insertions, 4 deletions
diff --git a/.github/workflows/generate_catalog_templates.yml b/.github/workflows/generate_catalog_templates.yml index d8a79699d..b4bd2fe11 100644 --- a/.github/workflows/generate_catalog_templates.yml +++ b/.github/workflows/generate_catalog_templates.yml @@ -1,4 +1,4 @@ -name: L10n +name: Generate catalog templates (POT) files fetched automatically by transifex on: push: branches: @@ -23,3 +23,16 @@ jobs: title: l10n branch: update-l10n signoff: true + - uses: pascalgn/automerge-action@v0.15.3 + if: steps.cpr.outputs.pull-request-operation == 'created' + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "" + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000 + PULL_REQUEST: ${{ github.event.inputs.pull-request-number }} + - uses: hmarr/auto-approve-action@v2.2.1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + pull-request-number: ${{ github.event.inputs.pull-request-number }} diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml index cd7ed6fa1..e59916cf2 100644 --- a/.github/workflows/transifex.yml +++ b/.github/workflows/transifex.yml @@ -1,4 +1,4 @@ -name: AutoMerge everything translations (Transifex and pot files update) +name: AutoMerge Transifex Pull Requests on: pull_request jobs: @@ -7,7 +7,7 @@ jobs: name: Approve steps: - uses: hmarr/auto-approve-action@v2.2.1 - if: github.actor == 'github-actions[bot]' || github.actor == 'transifex-integration[bot]' + if: github.actor == 'transifex-integration[bot]' with: github-token: "${{ secrets.GITHUB_TOKEN }}" @@ -16,7 +16,7 @@ jobs: name: Auto-merge steps: - uses: pascalgn/automerge-action@v0.15.3 - if: github.actor == 'github-actions[bot]' || github.actor == 'transifex-integration[bot]' + if: github.actor == 'transifex-integration[bot]' env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_LABELS: "" |