From 34e55b078022e52f8da62a5b0f4a4a430a77e2ad Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 1 Aug 2023 12:37:14 -0400 Subject: [PATCH 1/2] remove label checker ci job --- .github/workflows/label.yml | 49 ------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/label.yml diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml deleted file mode 100644 index 7cd574227..000000000 --- a/.github/workflows/label.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -name: Label Checker -on: - pull_request_target: - types: - - opened - - synchronize - - reopened - - labeled - - unlabeled - -jobs: - check_labels: - name: Check labels - runs-on: ubuntu-latest - steps: - - uses: docker://agilepathway/pull-request-label-checker:latest - with: - any_of: backport-2.15.x,development - repo_token: ${{ secrets.GITHUB_TOKEN }} - - set_milestone: - name: Set milestone - runs-on: ubuntu-latest - needs: [check_labels] - steps: - - uses: andrefcdias/add-to-milestone@v1.3.0 - if: ${{ contains(github.event.pull_request.labels.*.name, 'backport-2.15.x') }} - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - milestone: "2.15.1" - - uses: andrefcdias/add-to-milestone@v1.3.0 - if: ${{ contains(github.event.pull_request.labels.*.name, 'development') && !contains(github.event.pull_request.labels.*.name, 'backport-2.15.x')}} - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - milestone: "3.0.0" - - enable_auto_merge: - name: Enable automerge - runs-on: ubuntu-latest - needs: [set_milestone] - - # Specifically check that meeseeksmachine is opening the PR - if: github.event.pull_request.user.login == 'meeseeksmachine' - steps: - - uses: alexwilson/enable-github-automerge-action@main - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - merge-method: "REBASE" From 59c19b1815e1947bbf495959c95484e565108222 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 1 Aug 2023 15:25:03 -0400 Subject: [PATCH 2/2] remove note about backport labels in CONTRIBUTING.rst --- CONTRIBUTING.rst | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 381e8dce4..5a9c5022b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -48,19 +48,8 @@ to the maintainers, who are glad to assist you. these tools regularly, the ``pre-commit-ci`` bot will attempt to fix the issues with your pull request when you submit it. -.. note:: - Pull requests now require a "backport" label to be added to the pull request - so that the milestone will be automatically set and the PR will be automatically - backported (if necessary) to the appropriate release branch. These labels are: - - * ``backport-2.15.x`` for the ``2.15.x`` LTS releases. - * ``development`` for to mark as slated for the next release. - - The reviewer will add the label if you are unable to do so. - .. note:: Backporting changes is done automatically using ``meeseeksdev``. If you are a maintainer, you can comment ``@meeseeksdev backport to `` on a pull - request to manually trigger a backport if the correct labels were not applied. - Moreover, when merging a "backport" pull request, please use the "Rebase and merge" - option. + request to manually trigger a backport. Moreover, when merging a "backport" + pull request, please use the "Rebase and merge" option.