Skip to content

Commit de606f4

Browse files
committed
Merge branch '4.6' into temp-4.6-to-main
2 parents dd8f6a3 + 36e5439 commit de606f4

File tree

10 files changed

+3683
-50
lines changed

10 files changed

+3683
-50
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,25 @@ jobs:
1818
matrix:
1919
php:
2020
- '8.3'
21+
- '8.4'
2122
composer_options: [ "" ]
2223

2324
steps:
24-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v6
2526

26-
- name: Setup PHP Action
27-
uses: shivammathur/setup-php@v2
27+
- uses: ibexa/gh-workflows/actions/composer-install@main
2828
with:
29-
php-version: ${{ matrix.php }}
30-
coverage: none
31-
extensions: pdo_sqlite, gd
32-
tools: cs2pr
33-
34-
- uses: "ramsey/composer-install@v1"
35-
with:
36-
dependency-versions: "highest"
37-
composer-options: "${{ matrix.composer_options }}"
29+
gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
30+
gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
31+
satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
32+
satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
3833

3934
- name: Setup problem matchers for PHPUnit
4035
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4136

37+
- name: Run PHPStan analysis
38+
run: composer run-script phpstan
39+
4240
- name: Run test suite
4341
run: composer run-script --timeout=600 test
4442

@@ -50,22 +48,14 @@ jobs:
5048
php:
5149
- '8.3'
5250
steps:
53-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v6
5452

55-
- name: Setup PHP Action
56-
uses: shivammathur/setup-php@v2
53+
- uses: ibexa/gh-workflows/actions/composer-install@main
5754
with:
58-
php-version: ${{ matrix.php }}
59-
coverage: none
60-
extensions: 'pdo_sqlite, gd'
61-
tools: cs2pr
62-
63-
- uses: "ramsey/composer-install@v1"
64-
with:
65-
dependency-versions: "highest"
55+
gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
56+
gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
57+
satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
58+
satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
6659

6760
- name: Run code style check
6861
run: composer run-script check-cs -- --format=checkstyle | cs2pr
69-
70-
- name: Run PHPStan analysis
71-
run: composer run-script phpstan

0 commit comments

Comments
 (0)