diff --git a/.github/workflows/close-bad-repo-sync-prs.yml b/.github/workflows/close-bad-repo-sync-prs.yml index bec953168f..c62ed6a585 100644 --- a/.github/workflows/close-bad-repo-sync-prs.yml +++ b/.github/workflows/close-bad-repo-sync-prs.yml @@ -1,8 +1,7 @@ name: Close bad repo-sync PRs # **What it does**: -# Closes and PR from `repo-sync` to `main` that wasn't created by -# Octomerger or a Hubber. +# Closes and PR from `repo-sync` to `main` that wasn't created by a Hubber. # **Why we have it**: # Unfortunately, a lot of PRs in github/docs are created by people who # shouldn't be creating such PRs. We bot our bots to own it. @@ -17,7 +16,7 @@ permissions: jobs: close-invalid-repo-sync-pr: - if: ${{ github.repository == 'github/docs' && github.actor != 'Octomerger' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'repo-sync' }} + if: ${{ github.repository == 'github/docs' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'repo-sync' }} name: Close if invalid repo-sync PR author runs-on: ubuntu-latest steps: @@ -30,10 +29,6 @@ jobs: const prCreator = context.actor const prNumber = context.issue.number - if (prCreator === 'Octomerger') { - throw new Error("Should have been checked by the main if: condition on the job") - } - try { await github.rest.teams.getMembershipForUserInOrg({ org: 'github', diff --git a/.github/workflows/content-changes-table-comment.yml b/.github/workflows/content-changes-table-comment.yml index 78b5003495..0906af4677 100644 --- a/.github/workflows/content-changes-table-comment.yml +++ b/.github/workflows/content-changes-table-comment.yml @@ -19,7 +19,7 @@ concurrency: jobs: PR-Preview-Links: - if: github.event.pull_request.user.login != 'Octomerger' && (github.repository == 'github/docs-internal' || github.repository == 'github/docs') + if: github.event.pull_request.user.login != 'docs-bot' && (github.repository == 'github/docs-internal' || github.repository == 'github/docs') name: Add staging/live links to PR runs-on: ubuntu-latest outputs: diff --git a/.github/workflows/first-responder-docs-content.yml b/.github/workflows/first-responder-docs-content.yml index 5917a60caf..70370ee89f 100644 --- a/.github/workflows/first-responder-docs-content.yml +++ b/.github/workflows/first-responder-docs-content.yml @@ -42,8 +42,6 @@ jobs: `/orgs/github/teams/docs/members?per_page=100` ) const teamLogins = teamMembers.data.map(member => member.login) - // ignore PRs opened by docs bot accounts - teamLogins.push('Octomerger', 'octoglot') if (teamLogins.some(login => login === updatedIssueInformation.data.user.login)) { console.log(`This issue or pull request was authored by a member of the github/docs team.`) return 'true' diff --git a/.github/workflows/merged-notification.yml b/.github/workflows/merged-notification.yml index e6d5d7e7f0..aca6d56dc9 100644 --- a/.github/workflows/merged-notification.yml +++ b/.github/workflows/merged-notification.yml @@ -15,7 +15,7 @@ permissions: jobs: comment: - if: github.repository == 'github/docs' && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch && github.event.pull_request.user.login != 'Octomerger' + if: github.repository == 'github/docs' && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch && github.event.pull_request.user.login != 'docs-bot' runs-on: ubuntu-latest steps: - uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 diff --git a/.github/workflows/triage-unallowed-contributions.yml b/.github/workflows/triage-unallowed-contributions.yml index 4729a243da..1785d0ae67 100644 --- a/.github/workflows/triage-unallowed-contributions.yml +++ b/.github/workflows/triage-unallowed-contributions.yml @@ -28,7 +28,7 @@ jobs: if: >- ${{ github.repository == 'github/docs' && - github.event.pull_request.user.login != 'Octomerger' && + github.event.pull_request.user.login != 'docs-bot' && github.event.pull_request.user.login != 'dependabot[bot]' }} runs-on: ubuntu-latest diff --git a/script/README.md b/script/README.md index de5941f023..48c1778280 100644 --- a/script/README.md +++ b/script/README.md @@ -32,7 +32,7 @@ Runs tests. Equivalent of `npm test`. ### [`anonymize-branch.js`](anonymize-branch.js) -Flatten all the commits in the current branch into a single anonymized @Octomerger commit +Flatten all the commits in the current branch into a single anonymized @docs-bot commit Usage: script/anonymize-branch.js [base-branch] Example: script/anonymize-branch.js "nothing to see here" If the optional [base-branch] argument is omitted, it will default to `main` diff --git a/script/anonymize-branch.js b/script/anonymize-branch.js index 06d5c0e374..147cc54082 100755 --- a/script/anonymize-branch.js +++ b/script/anonymize-branch.js @@ -2,7 +2,7 @@ // [start-readme] // -// Flatten all the commits in the current branch into a single anonymized @Octomerger commit +// Flatten all the commits in the current branch into a single anonymized @docs-bot commit // // Usage: script/anonymize-branch.js [base-branch] // Example: script/anonymize-branch.js "nothing to see here" @@ -13,9 +13,9 @@ import { execSync as exec } from 'child_process' import path from 'path' -process.env.GIT_AUTHOR_NAME = process.env.GIT_COMMITTER_NAME = 'Octomerger Bot' +process.env.GIT_AUTHOR_NAME = process.env.GIT_COMMITTER_NAME = 'Docs Bot' process.env.GIT_AUTHOR_EMAIL = process.env.GIT_COMMITTER_EMAIL = - '63058869+Octomerger@users.noreply.github.com' + '63058869+docs-bot@users.noreply.github.com' const args = process.argv.slice(2) const message = args[0]