diff --git a/.github/workflows/autoupdate-branch.yml b/.github/workflows/autoupdate-branch.yml index 0b14fbab40..ced565ca53 100644 --- a/.github/workflows/autoupdate-branch.yml +++ b/.github/workflows/autoupdate-branch.yml @@ -1,12 +1,12 @@ name: Autoupdate branch -# **What it does**: Any pull requests with "autoupdate" label will get main branch updates. -# **Why we have it**: Our repo-sync automation relies on it. -# **Who does it impact**: Our ability to support the open-source repository. +# **What it does**: Any pull requests with automerge will get main branch updates. +# **Why we have it**: So we don't have to watch pull requests and click update branch 100x. +# **Who does it impact**: Our health. # # This workflow checks all open PRs targeting `main` as their base branch and -# will attempt to update them if they have the `autoupdate` label applied. +# will attempt to update them if they have automerge. # It is triggered when a `push` event occurs ON the `main` branch (e.g. a PR # was merged or a force-push was done). # @@ -31,6 +31,5 @@ jobs: - uses: docker://chinthakagodawita/autoupdate-action:v1 env: GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - PR_FILTER: labelled - PR_LABELS: autoupdate + PR_FILTER: auto_merge MERGE_MSG: "Branch was updated using the 'autoupdate branch' Actions workflow." diff --git a/.github/workflows/enterprise-dates.yml b/.github/workflows/enterprise-dates.yml index 01a233bc02..b5334aa6ff 100644 --- a/.github/workflows/enterprise-dates.yml +++ b/.github/workflows/enterprise-dates.yml @@ -64,7 +64,6 @@ jobs: "Hello! The GitHub Enterprise Server release dates have changed.\n\n If CI passes, this PR will be auto-merged. :green_heart:\n\n If CI does not pass or other problems arise, contact #docs-engineering on slack.\n\nThis PR was 🤖-crafted by `.github/workflows/enterprise-dates.yml`. 🧶" - labels: autoupdate branch: enterprise-server-dates-update delete-branch: true diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 32f009c63d..c687fb6785 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -126,7 +126,7 @@ jobs: destination_branch: main pr_title: 'repo sync' pr_body: "This is an automated pull request to sync changes between the public and private repos.\n\n:robot: This pull request should be merged (not squashed) to preserve continuity across repos, so please let a bot do the merging!" - pr_label: autoupdate,automated-reposync-pr + pr_label: automated-reposync-pr github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} - name: Find pull request diff --git a/.github/workflows/update-graphql-files.yml b/.github/workflows/update-graphql-files.yml index d4ae85d530..e74ab227c4 100644 --- a/.github/workflows/update-graphql-files.yml +++ b/.github/workflows/update-graphql-files.yml @@ -58,7 +58,6 @@ jobs: syncs up the GraphQL data in this repo.\n\n If CI passes, this PR will be auto-merged. :green_heart:\n\n If CI does not pass or other problems arise, contact #docs-engineering on slack." - labels: autoupdate branch: graphql-schema-update - name: Enable GitHub auto-merge