diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index 51412ff..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Auto merge - -on: - workflow_run: - types: - - completed - workflows: - - 'Tests' - -jobs: - merge-me: - name: Auto merge - - runs-on: ubuntu-latest - - steps: - - name: Auto merge - if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2 - with: - # Depending on branch protection rules, a manually populated - # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to - # a protected branch must be used. - # - # When using a custom token, it is recommended to leave the following - # comment for other developers to be aware of the reasoning behind it: - # - # This must be used as GitHub Actions token does not support pushing - # to protected branches. - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PRESET: DEPENDABOT_MINOR diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml deleted file mode 100644 index 9c1557a..0000000 --- a/.github/workflows/composer-normalize.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: normalize composer.json - -on: - push: - paths: - - 'composer.json' - -jobs: - normalize: - timeout-minutes: 1 - runs-on: ubuntu-latest - steps: - - name: Git checkout - uses: actions/checkout@v3 - - - name: Validate Composer configuration - run: composer validate --strict - - - name: Normalize composer.json - run: | - composer global require ergebnis/composer-normalize - composer normalize --indent-style=space --indent-size=4 --no-check-lock --no-update-lock --no-interaction --ansi - - - uses: stefanzweifel/git-auto-commit-action@v4.16.0 - with: - commit_message: normalize composer.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 051b5b0..3920d58 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,15 +6,13 @@ jobs: strategy: matrix: php: ['8.0', '8.1'] - laravel: [8.*, 9.*, 10.*] + laravel: [9.*, 10.*] dependency-version: [prefer-stable] include: - laravel: 10.* testbench: 8.* - laravel: 9.* testbench: 7.* - - laravel: 8.* - testbench: 6.* exclude: - laravel: 10.* php: 8.0 @@ -49,6 +47,9 @@ jobs: env: APP_ENV: testing + - name: Normalize composer.json + run: composer normalize --indent-style=space --indent-size=4 --no-check-lock --no-update-lock --no-interaction --ansi + - name: Run tests run: composer run test env: diff --git a/composer.json b/composer.json index 818b269..82c2f66 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "codedge/laravel-fpdf", - "description": "Laravel package to include Fpdf. It ships with Fpdf 1.84.", + "description": "Laravel package to include Fpdf. It ships with Fpdf 1.85.", "license": "MIT", "keywords": [ "fpdf", @@ -18,12 +18,13 @@ "source": "https://github.com/codedge/laravel-fpdf" }, "require": { - "php": "^8.0 || ^8.1", - "illuminate/support": "^8.0 || ^9.0|^10.0" + "php": "~8.0 || ~8.1", + "illuminate/support": "^9.0 || ^10.0" }, "require-dev": { - "orchestra/testbench": "^6.25.1|^8.0", - "phpunit/phpunit": "^9.6.0|^9.5.10" + "ergebnis/composer-normalize": "^2.29", + "orchestra/testbench": "^6.25.1 || ^8.0", + "phpunit/phpunit": "^9.6.0" }, "minimum-stability": "dev", "prefer-stable": true, @@ -38,7 +39,9 @@ } }, "config": { - "allow-plugins": [], + "allow-plugins": { + "ergebnis/composer-normalize": true + }, "sort-packages": true }, "extra": {