Skip to content

Commit 483028a

Browse files
authored
Refactor PHP workflow for improved clarity and structure
1 parent e89e3eb commit 483028a

1 file changed

Lines changed: 30 additions & 26 deletions

File tree

.github/workflows/php.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,14 @@ jobs:
5757
steps:
5858
- uses: actions/checkout@v4
5959
- run: >-
60-
composer validate
61-
--check-lock
62-
--no-plugins
63-
--no-scripts
64-
--strict
60+
composer validate
61+
--check-lock
62+
--no-plugins
63+
--no-scripts
64+
--strict
6565
working-directory: "solid"
6666
# 02.test.php.test-unit.yml
6767
php-unittest:
68-
name: PHP Unit Tests
69-
needs:
70-
- lint-php-syntax
71-
- validate-dependencies-file
72-
runs-on: ubuntu-24.04
7368
container:
7469
image: ghcr.io/${{ github.repository }}:main-${{ matrix.nextcloud_version }}
7570
env:
@@ -80,6 +75,15 @@ jobs:
8075
- ./.config/:/var/www/html/apps/.config
8176
# Mount the PHP composer executable into the container.
8277
- /usr/bin/composer:/usr/bin/composer
78+
defaults:
79+
run:
80+
shell: bash
81+
working-directory: /var/www/html/apps/
82+
name: PHP Unit Tests
83+
needs:
84+
- lint-php-syntax
85+
- validate-dependencies-file
86+
runs-on: ubuntu-24.04
8387
strategy:
8488
fail-fast: false
8589
matrix:
@@ -92,21 +96,21 @@ jobs:
9296
- name: Install and Cache Composer dependencies
9397
uses: ramsey/composer-install@v3
9498
with:
95-
working-directory: "solid"
99+
working-directory: /var/www/html/apps/solid
96100
env:
97101
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
98-
- name: Run PHPUnit
102+
- name: Debug info
99103
run: |
100-
echo -e "PWD:'$PWD'\nGITHUB_WORKSPACE:'${GITHUB_WORKSPACE}'"
104+
echo " =====> PWD:'$PWD'"
101105
ls -lA "$PWD"
106+
echo " =====> GITHUB_WORKSPACE:'${GITHUB_WORKSPACE}'"
102107
ls -lA "$GITHUB_WORKSPACE"
103-
ls -lA "${GITHUB_WORKSPACE}/solid/"
104-
ls -lA "${GITHUB_WORKSPACE}/solid/bin"
105-
ls -lA "${GITHUB_WORKSPACE}/solid/vendor/"
106-
107-
"${GITHUB_WORKSPACE}/solid/bin/phpunit" \
108-
--configuration "${GITHUB_WORKSPACE}/solid/phpunit.xml" \
109-
"${GITHUB_WORKSPACE}/solid/tests/Unit"
108+
echo ' =====> ${GITHUB_WORKSPACE}/solid/'
109+
- name: Run PHPUnit
110+
run: |
111+
${GITHUB_WORKSPACE}/solid/bin/phpunit \
112+
--configuration ${GITHUB_WORKSPACE}/solid/phpunit.xml \
113+
${GITHUB_WORKSPACE}/solid/tests/Unit
110114
111115
# 03.quality.php.scan.dependencies-vulnerabilities.yml
112116
scan-dependencies-vulnerabilities:
@@ -117,12 +121,12 @@ jobs:
117121
steps:
118122
- uses: actions/checkout@v4
119123
- run: >-
120-
composer audit
121-
--abandoned=report
122-
--locked
123-
--no-dev
124-
--no-plugins
125-
--no-scripts
124+
composer audit
125+
--abandoned=report
126+
--locked
127+
--no-dev
128+
--no-plugins
129+
--no-scripts
126130
working-directory: "solid"
127131
# 03.quality.php.lint-quality.yml
128132
php-lint-quality:

0 commit comments

Comments
 (0)