Skip to content
4 changes: 2 additions & 2 deletions .github/workflows/ci-dockerfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
runs-on: "ubuntu-22.04"

steps:
- uses: "actions/checkout@v4"
- uses: "actions/checkout@v5"

- name: "Lint Dockerfile"
uses: "hadolint/hadolint-action@v3.1.0"
uses: "hadolint/hadolint-action@v3.2.0"
with:
dockerfile: ".docker/validate-against-schema/Dockerfile"
2 changes: 1 addition & 1 deletion .github/workflows/ci-shell-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v5"

- name: "Lint shell scripts with ShellCheck"
uses: "ludeeus/action-shellcheck@2.0.0"
Expand Down
39 changes: 3 additions & 36 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,6 @@ on:
- cron: "0 17 * * *"

jobs:
coding-standards:
name: "Coding Standards"

runs-on: "ubuntu-22.04"

strategy:
matrix:
php-version:
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v4"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-"

- name: "Install dependencies with composer"
run: "composer update --no-interaction --no-progress --no-suggest"

- name: "Run squizlabs/php_codesniffer"
run: "vendor/bin/phpcs"

validate-against-schema:
name: "Validate against schema"

Expand All @@ -56,7 +23,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v5"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
Expand Down Expand Up @@ -100,7 +67,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v5"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
Expand Down Expand Up @@ -139,7 +106,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v5"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ on:
jobs:
json-validate:
name: "Validate JSON schema"
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.2"
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"
4 changes: 1 addition & 3 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
>
<description>Check the code of the sniffs in doctrine/coding-standards.</description>
<description>Used by the binaries inside bin/</description>

<arg name="basepath" value="." />
<arg name="extensions" value="php" />
Expand All @@ -17,6 +17,4 @@
<arg value="s" />

<rule ref="Doctrine" />

<file>lib</file>
</ruleset>