diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml deleted file mode 100644 index 4c0e6e4..0000000 --- a/.github/workflows/auto_approve.yml +++ /dev/null @@ -1,14 +0,0 @@ -on: pull_request_review -name: 'Label approved pull requests' -jobs: - labelWhenApproved: - name: 'Label when approved' - runs-on: ubuntu-latest - steps: - - name: 'Label when approved' - uses: pullreminders/label-when-approved-action@master - env: - APPROVALS: "1" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ADD_LABEL: "approved" - REMOVE_LABEL: "awaiting review" diff --git a/.github/workflows/auto_merge.yml b/.github/workflows/auto_merge.yml deleted file mode 100644 index d009c07..0000000 --- a/.github/workflows/auto_merge.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: 'Auto merge of approved pull requests with passed checks' - -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - check_suite: - types: - - completed - status: {} - -jobs: - automerge: - runs-on: ubuntu-latest - steps: - - name: 'Automerge PR' - uses: "pascalgn/automerge-action@v0.12.0" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_METHOD: 'squash' - MERGE_LABELS: "approved,!work in progress" - MERGE_REMOVE_LABELS: "approved" - MERGE_COMMIT_MESSAGE: "pull-request-description" - MERGE_RETRIES: "6" - MERGE_RETRY_SLEEP: "10000" - UPDATE_LABELS: "" - UPDATE_METHOD: "rebase" - MERGE_DELETE_BRANCH: false diff --git a/composer.json b/composer.json index 01f412a..059496b 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "require-dev": { "umbrellio/code-style-php": "^1.0", - "orchestra/testbench": "^3.5|^6.0|^4.0|^7.0|^8.0", + "orchestra/testbench": "^3.5|^6.0|^4.0|^7.0|^8.0|^9.0", "php-coveralls/php-coveralls": "^2.1", "squizlabs/php_codesniffer": "^3.5" },