diff --git a/.github/workflows/sync-strings.yml b/.github/workflows/sync-strings.yml index 6c8b270f2..bf09b110d 100644 --- a/.github/workflows/sync-strings.yml +++ b/.github/workflows/sync-strings.yml @@ -42,4 +42,3 @@ jobs: branch: automation/sync-strings-${{ steps.fenix-beta-version.outputs.major-beta-version }} title: "Sync Strings from main to releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0" body: "This (automated) PR syncs strings from `main` to `releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0.0`" - labels: needs:review diff --git a/.mergify.yml b/.mergify.yml index 5b76b6c6f..2fd025e12 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -24,9 +24,18 @@ pull_request_rules: rebase_fallback: none - name: L10N - Auto Merge conditions: - - author=mozilla-l10n-automation-bot - - status-success=pr-complete - - files~=(strings.xml|l10n.toml) + - and: + - files~=(strings.xml|l10n.toml) + - or: + - and: + - author=mozilla-l10n-automation-bot + - base=main + - status-success=pr-complete + - and: + - author=github-actions[bot] + - base~=releases[_/].* + # Taskcluster doesn't run when PRs are created by github-actions[bot] + # because it's not considered a collaborator. actions: review: type: APPROVE