Skip to content

Commit

Permalink
Merge pull request #758 from driehle/upstream-workflows
Browse files Browse the repository at this point in the history
Updated upstream workflows
  • Loading branch information
driehle authored Dec 30, 2024
2 parents fa1189d + 72cbd36 commit 61c1a16
Show file tree
Hide file tree
Showing 8 changed files with 113 additions and 40 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@1.5.1"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"
with:
php-version: '8.3'
php-version: "8.3"
22 changes: 22 additions & 0 deletions .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "Composer Lint"

on:
pull_request:
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@6.0.0"
with:
php-version: "8.3"
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/documentation.yml@6.0.0"
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/phpstan.yml@6.0.0"
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/release-on-milestone-closed.yml@1.5.1"
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
16 changes: 0 additions & 16 deletions .github/workflows/static-analysis.yml

This file was deleted.

24 changes: 14 additions & 10 deletions docs/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ Run the following to install this library using `Composer <https://getcomposer.o
Next Steps
----------

.. toctree::
:caption: Table of Contents

user-guide
developer-tools
configuration
cache
migrations
forms
miscellaneous
- :doc:`User Guide <user-guide>`:
general introduction.
- :doc:`Developer Tools <developer-tools>`:
setting up Laminas Developer Tools.
- :doc:`Configuration <configuration>`:
learn how to configure DoctrineORMModule.
- :doc:`Caching <cache>`:
learn how to configure caches.
- :doc:`Migrations <migrations>`:
learn how to use database migrations.
- :doc:`Laminas Forms <forms>`:
learn about custom Laminas form elements.
- :doc:`Laminas Forms <miscellaneous>`:
learn about authentication and custom DBAL types.
21 changes: 12 additions & 9 deletions docs/en/sidebar.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
:orphan:

.. toctree::
:depth: 3
:caption: Doctrine ORM Module
:depth: 3

index
user-guide
developer-tools
configuration
cache
migrations
forms
miscellaneous
index
user-guide
developer-tools
configuration
cache
migrations
forms
miscellaneous

0 comments on commit 61c1a16

Please sign in to comment.