Skip to content

Commit 14d8cb7

Browse files
authored
Merge branch '5.3-dev' into ghactions-codestyle
2 parents 31572a6 + f62a9c5 commit 14d8cb7

File tree

2 files changed

+174
-173
lines changed

2 files changed

+174
-173
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ jobs:
5656
code-style-php:
5757
name: Check PHP code style
5858
runs-on: ubuntu-latest
59-
permissions:
60-
contents: read
61-
pull-requests: write
62-
container: joomlaprojects/docker-images:php8.4
63-
needs: [composer]
59+
strategy:
60+
matrix:
61+
command: ['php-cs-fixer fix -vvv --dry-run --diff', 'phpcs --extensions=php -p --standard=ruleset.xml .']
6462
steps:
6563
- uses: actions/checkout@v4
6664
- uses: actions/cache/restore@v4
@@ -72,8 +70,7 @@ jobs:
7270
PHP_CS_FIXER_IGNORE_ENV: true
7371
run: |
7472
git config --global --add safe.directory $GITHUB_WORKSPACE
75-
./libraries/vendor/bin/php-cs-fixer fix --show-progress=dots
76-
./libraries/vendor/bin/phpcbf --extensions=php -p --standard=ruleset.xml .
73+
./libraries/vendor/bin/${{ matrix.command }}
7774
- uses: parkerbxyz/suggest-changes@v2
7875
env:
7976
ACTIONS_STEP_DEBUG: true
@@ -85,6 +82,9 @@ jobs:
8582
runs-on: ubuntu-latest
8683
container: joomlaprojects/docker-images:php8.4
8784
needs: [composer, npm]
85+
strategy:
86+
matrix:
87+
check: ['lint:js', 'lint:testjs', 'lint:css']
8888
steps:
8989
- uses: actions/setup-node@v4
9090
with:
@@ -96,12 +96,8 @@ jobs:
9696
node_modules
9797
media
9898
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**') }}
99-
- name: Check JS code style
100-
run: |
101-
npm run lint:js
102-
npm run lint:testjs
103-
- name: Check CSS code style
104-
run: npm run lint:css
99+
- name: Check code style
100+
run: npm run ${{ matrix.check }}
105101

106102
phpstan:
107103
name: Run PHPstan
@@ -212,6 +208,7 @@ jobs:
212208
needs: [tests-system-prepare]
213209
strategy:
214210
matrix:
211+
browser: ['chrome', 'edge']
215212
config:
216213
- php_version: '8.4'
217214
test_group: cmysqlmax
@@ -250,7 +247,7 @@ jobs:
250247
/github/home/.cache/Cypress
251248
key: ${{ runner.os }}-cypress-${{ hashFiles('package-lock.json') }}
252249
- name: Run System tests
253-
run: bash tests/System/entrypoint.sh "$(pwd)" ${{ matrix.config.test_group }} ${{ matrix.config.db_engine }} ${{ matrix.config.db_host }} chrome
250+
run: bash tests/System/entrypoint.sh "$(pwd)" ${{ matrix.config.test_group }} ${{ matrix.config.db_engine }} ${{ matrix.config.db_host }} ${{ matrix.browser }}
254251
- name: Archive test results results
255252
uses: actions/upload-artifact@v4
256253
if: always()

0 commit comments

Comments
 (0)