diff --git a/.github/labeler.config.yml b/.github/labeler.config.yml deleted file mode 100644 index 3e8b7b9..0000000 --- a/.github/labeler.config.yml +++ /dev/null @@ -1,48 +0,0 @@ -type:build: - - ".github/**/*" - - ".coveralls.yml" - - ".gitignore" - - "ecs.yml" - - "phpcs.xml" - -dependencies: - - "composer.json" - - "composer.lock" - -type:helper: - - "src/Helpers/**/*" - - "src/Traits/**/*" - -type:collections: - - "src/Collections/**/*" - -type:providers: - - "src/Providers/**/*" - - "src/Schema/**/*" - - "src/Types/**/*" - - "src/LTreeExtension.php" - -type:resources: - - "src/Resources/**/*" - -type:relations: - - "src/Relations/**/*" - -type:services: - - "src/Services/**/*" - - "src/Exceptions/**/*" - -type:interfaces: - - "src/Interfaces/**/*" - -type:tests: - - 'tests/**/*' - - 'phpunit.xml.dist' - - 'tests.sh' - -theme:docs: - - "README.md" - - "LICENSE" - - "CONTRIBUTING.md" - - "CODE_OF_CONDUCT.md" - - "src/.meta.php" 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_labeler.yml b/.github/workflows/auto_labeler.yml deleted file mode 100644 index 6b13754..0000000 --- a/.github/workflows/auto_labeler.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: "Auto labeling for a pull request" -on: - - pull_request_target - -jobs: - triage: - name: "Checking for labels" - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@main - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - sync-labels: true - configuration-path: ".github/labeler.config.yml" 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/.github/workflows/ci.yml b/.github/workflows/ci.yml index a778b83..8789576 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,21 +20,21 @@ env: DB_PASSWORD: 'postgres' DB_HOST: '127.0.0.1' -jobs: +jobs: lint: runs-on: '${{ matrix.operating_system }}' - timeout-minutes: 20 - strategy: + timeout-minutes: 20 + strategy: matrix: operating_system: - ubuntu-latest php_versions: - '7.4' fail-fast: false - env: + env: PHP_CS_FIXER_FUTURE_MODE: '0' name: 'Lint PHP' - steps: + steps: - name: 'Checkout' uses: actions/checkout@v2 - name: 'Setup cache environment' @@ -51,11 +51,11 @@ jobs: key: '${{ steps.cache-env.outputs.key }}' restore-keys: '${{ steps.cache-env.outputs.key }}' - name: 'Setup PHP' - uses: shivammathur/setup-php@v2 - with: + uses: shivammathur/setup-php@v2 + with: php-version: ${{ matrix.php_versions }} extensions: '${{ env.php_extensions }}' - ini-values: memory_limit=-1 + ini-values: memory_limit=-1 tools: pecl, composer coverage: none - name: 'Setup problem matchers for PHP (aka PHP error logs)' @@ -108,6 +108,14 @@ jobs: postgres: '13' php_versions: '8.0' experimental: true + - operating_system: ubuntu-latest + postgres: '14' + php_versions: '8.1' + experimental: true + - operating_system: ubuntu-latest + postgres: '15' + php_versions: '8.2' + experimental: true runs-on: '${{ matrix.operating_system }}' services: postgres: @@ -165,7 +173,6 @@ jobs: -e "s/\${HOST}/${{ env.DB_HOST }}/" \ phpunit.xml.dist > phpunit.xml ./vendor/bin/phpunit \ - --verbose \ --stderr \ --coverage-clover build/logs/clover.xml working-directory: './' diff --git a/composer.json b/composer.json index fc5f2d2..059496b 100644 --- a/composer.json +++ b/composer.json @@ -21,15 +21,15 @@ ], "license": "MIT", "require": { - "php": "^7.3|^7.4|^8.0|^8.1", - "laravel/framework": "^5.8|^6.20.26|^7.0|^8.40|^9.0|^10.0", + "php": "^7.3|^7.4|^8.0|^8.1|^8.2", + "laravel/framework": "^5.8|^6.20.26|^7.0|^8.40|^9.0|^10.0|^11.0", "doctrine/dbal": "^2.9|^3.0", - "umbrellio/laravel-pg-extensions": "^5.0", + "umbrellio/laravel-pg-extensions": "^5.0|^6.0", "umbrellio/laravel-common-objects": "^2.3" }, "require-dev": { "umbrellio/code-style-php": "^1.0", - "orchestra/testbench": "^3.5|^6.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" },