From 6d026042f88ccabb2f0416b4d6aaa044ea6bb7da Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Thu, 28 Nov 2024 12:13:45 +0100 Subject: [PATCH] upgraded upstream workflows --- .github/workflows/coding-standards.yml | 16 +++++++++-- .github/workflows/composer-lint.yml | 4 ++- .github/workflows/continuous-integration.yml | 19 ++++++++++--- .github/workflows/documentation.yml | 20 +++++++++++++ .github/workflows/phpstan.yml | 28 +++++++++++++++++++ .../workflows/release-on-milestone-closed.yml | 6 ++-- .github/workflows/static-analysis.yml | 16 ----------- .gitignore | 3 +- composer.json | 5 ++-- docs/en/sidebar.rst | 1 + 10 files changed, 89 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/documentation.yml create mode 100644 .github/workflows/phpstan.yml delete mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 064eb30..1e78392 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -4,13 +4,25 @@ on: pull_request: branches: - "*.x" + paths: + - ".github/workflows/coding-standards.yml" + - "composer.*" + - "src/**" + - "phpcs.xml.dist" + - "tests/**" push: branches: - "*.x" + paths: + - ".github/workflows/coding-standards.yml" + - "composer.*" + - "src/**" + - "phpcs.xml.dist" + - "tests/**" jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0" with: - php-version: '8.3' + php-version: "8.3" diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml index 91df064..39e14e0 100644 --- a/.github/workflows/composer-lint.yml +++ b/.github/workflows/composer-lint.yml @@ -5,16 +5,18 @@ on: branches: - "*.x" paths: + - ".github/workflows/composer-lint.yml" - "composer.json" push: branches: - "*.x" paths: + - ".github/workflows/composer-lint.yml" - "composer.json" jobs: composer-lint: name: "Composer Lint" - uses: "doctrine/.github/.github/workflows/composer-lint.yml@3.0.0" + uses: "doctrine/.github/.github/workflows/composer-lint.yml@6.0.0" with: php-version: "8.3" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 65bbf54..6e4b5e0 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -4,16 +4,27 @@ on: pull_request: branches: - "*.x" + paths: + - ".github/workflows/continuous-integration.yml" + - "composer.*" + - "src/**" + - "phpunit.xml.dist" + - "tests/**" push: branches: - "*.x" - -env: - fail-fast: true + paths: + - ".github/workflows/continuous-integration.yml" + - "composer.*" + - "src/**" + - "phpunit.xml.dist" + - "tests/**" jobs: phpunit: name: "PHPUnit" - uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@6.0.0" with: php-versions: '["8.1", "8.2", "8.3"]' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml new file mode 100644 index 0000000..84bf616 --- /dev/null +++ b/.github/workflows/documentation.yml @@ -0,0 +1,20 @@ +name: "Documentation" + +on: + pull_request: + branches: + - "*.x" + paths: + - ".github/workflows/documentation.yml" + - "docs/**" + push: + branches: + - "*.x" + paths: + - ".github/workflows/documentation.yml" + - "docs/**" + +jobs: + documentation: + name: "Documentation" + uses: "doctrine/.github/.github/workflows/documentation.yml@6.0.0" diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 0000000..e5d3006 --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,28 @@ +name: "Static Analysis" + +on: + pull_request: + branches: + - "*.x" + paths: + - ".github/workflows/phpstan.yml" + - "composer.*" + - "src/**" + - "phpstan*" + - "tests/**" + push: + branches: + - "*.x" + paths: + - ".github/workflows/phpstan.yml" + - "composer.*" + - "src/**" + - "phpstan*" + - "tests/**" + +jobs: + static-analysis: + name: "Static Analysis" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@6.0.0" + with: + php-version: "8.3" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index dedbe7a..6f62146 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -8,11 +8,11 @@ on: jobs: release: name: "Git tag, release & create merge-up PR" - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0" - with: - use-next-minor-as-default-branch: true + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@6.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }} SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }} + with: + use-next-minor-as-default-branch: true # defaults to false diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index 14e2f59..0000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Static Analysis" - -on: - pull_request: - branches: - - "*.x" - push: - branches: - - "*.x" - -jobs: - static-analysis: - name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0" - with: - php-version: '8.3' diff --git a/.gitignore b/.gitignore index 9ba8876..564b8da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ /.phpcs.cache -/.phpunit.cache/ /.phpunit.result.cache /coverage.xml /composer.lock /phpcs.xml /phpunit.xml +/.phpunit.cache/ +/output/ /vendor/ diff --git a/composer.json b/composer.json index f8432b2..4babea2 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,9 @@ }, "require-dev": { "doctrine/coding-standard": "^12.0.0", - "phpstan/phpstan": "^1.9.2", - "phpunit/phpunit": "^10.5", + "phpdocumentor/guides-cli": "^1.5.0", + "phpstan/phpstan": "^1.12.11", + "phpunit/phpunit": "^10.5.38", "vimeo/psalm": "^5.15.0" }, "autoload": { diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst index 3ed2458..014b9d8 100644 --- a/docs/en/sidebar.rst +++ b/docs/en/sidebar.rst @@ -1,3 +1,4 @@ +:orphan: .. toctree:: :depth: 3