Skip to content

Commit

Permalink
upgraded upstream workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
driehle committed Nov 28, 2024
1 parent edb0906 commit 6d02604
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 29 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 3 additions & 1 deletion .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
19 changes: 15 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
20 changes: 20 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]"
28 changes: 28 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]"
with:
php-version: "8.3"
6 changes: 3 additions & 3 deletions .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
use-next-minor-as-default-branch: true
uses: "doctrine/.github/.github/workflows/[email protected]"
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
16 changes: 0 additions & 16 deletions .github/workflows/static-analysis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/.phpcs.cache
/.phpunit.cache/
/.phpunit.result.cache
/coverage.xml
/composer.lock
/phpcs.xml
/phpunit.xml
/.phpunit.cache/
/output/
/vendor/
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions docs/en/sidebar.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
:orphan:
.. toctree::
:depth: 3

Expand Down

0 comments on commit 6d02604

Please sign in to comment.