Skip to content

Commit 426cf85

Browse files
authored
Merge branch 'main' into patch-2
2 parents 9a3f834 + a1c7c99 commit 426cf85

354 files changed

Lines changed: 2280 additions & 1604 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package.json @github/docs-engineering
1919
/.github/workflows/create-translation-batch-pr.yml @github/docs-localization
2020
/.github/workflows/crowdin.yml @github/docs-localization
2121
/crowdin*.yml @github/docs-engineering @github/docs-localization
22-
/translations/ @github/docs-engineering @github/docs-localization @github-actions
23-
/translations/log/ @github/docs-localization @github-actions
22+
/translations/ @github/docs-engineering @github/docs-localization @Octomerger
23+
/translations/log/ @github/docs-localization @Octomerger
2424

2525
# Site Policy
2626
/content/github/site-policy/ @github/site-policy-admins

.github/workflows/create-translation-batch-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ jobs:
175175
- name: Approve PR
176176
if: github.ref_name == 'main'
177177
env:
178-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
178+
GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
179179
run: gh pr review --approve || echo "Nothing to approve"
180180

181181
- name: Set auto-merge
182182
if: github.ref_name == 'main'
183183
env:
184-
GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }}
184+
GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
185185
run: gh pr merge ${{ steps.set-branch.outputs.BRANCH_NAME }} --auto --squash || echo "Nothing to merge"
186186

187187
# When the maximum execution time is reached for this job, Actions cancels the workflow run.
-14.7 KB
-13.6 KB
-56.9 KB
-11.3 KB
-34.5 KB
-12.2 KB
-84.2 KB
-90.8 KB

0 commit comments

Comments
 (0)