diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ada76bc69c..b429ac5662 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,8 +19,8 @@ package.json @github/docs-engineering /.github/workflows/create-translation-batch-pr.yml @github/docs-localization /.github/workflows/crowdin.yml @github/docs-localization /crowdin*.yml @github/docs-engineering @github/docs-localization -/translations/ @github/docs-engineering @github/docs-localization -/translations/log/ @github/docs-localization +/translations/ @github/docs-engineering @github/docs-localization @Octomerger +/translations/log/ @github/docs-localization @Octomerger # Site Policy /content/github/site-policy/ @github/site-policy-admins diff --git a/.github/workflows/create-translation-batch-pr.yml b/.github/workflows/create-translation-batch-pr.yml index c7e929d9af..af1059a162 100644 --- a/.github/workflows/create-translation-batch-pr.yml +++ b/.github/workflows/create-translation-batch-pr.yml @@ -175,13 +175,13 @@ jobs: - name: Approve PR if: github.ref_name == 'main' env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} run: gh pr review --approve || echo "Nothing to approve" - name: Set auto-merge if: github.ref_name == 'main' env: - GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }} + GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} run: gh pr merge ${{ steps.set-branch.outputs.BRANCH_NAME }} --auto --squash || echo "Nothing to merge" # When the maximum execution time is reached for this job, Actions cancels the workflow run.