Skip to content

Commit d51f4c7

Browse files
committed
ci updates
1 parent 47c58b9 commit d51f4c7

File tree

1 file changed

+34
-36
lines changed

1 file changed

+34
-36
lines changed

.github/workflows/ci.yml

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,16 @@ on:
1616

1717
jobs:
1818

19-
test:
20-
21-
strategy:
22-
fail-fast: false
23-
matrix:
24-
include:
25-
- operating-system: 'ubuntu-latest'
26-
silverstripe-version: '5.0'
27-
php-version: '8.1'
28-
- operating-system: 'ubuntu-latest'
29-
silverstripe-version: '4.0'
30-
php-version: '8.0'
31-
- operating-system: 'ubuntu-latest'
32-
silverstripe-version: '4.0'
33-
php-version: '7.4'
34-
35-
name: SS ${{ matrix.silverstripe-version }}, PHP ${{ matrix.php-version }}
36-
runs-on: ${{ matrix.operating-system }}
37-
steps:
38-
- uses: actions/checkout@v3
39-
- uses: php-actions/composer@v6
40-
with:
41-
command: update
42-
--with silverstripe/framework:^${{ matrix.silverstripe-version }}
43-
php_version: ${{ matrix.php-version }}
44-
php_extensions: intl
45-
- run: |
46-
./vendor/bin/phpunit -c phpunit.xml.dist
47-
48-
tidy:
49-
50-
name: "Annotate & Tidy"
51-
needs: [test]
19+
latest:
20+
name: "Test & Update"
5221
runs-on: 'ubuntu-latest'
5322
steps:
5423
- uses: actions/checkout@v3
5524
- uses: php-actions/composer@v6
5625
with:
5726
command: update
5827
--with silverstripe/framework:^5.0
59-
php_version: 8.1
28+
php_version: 8.2
6029
php_extensions: xdebug intl
6130
- name: Generate Code Coverage
6231
run: |
@@ -84,11 +53,40 @@ jobs:
8453
git push origin HEAD:${{ github.head_ref || github.ref_name }} \
8554
)
8655
87-
merge:
56+
matrix:
57+
name: "Test Matrix"
58+
needs: [latest]
59+
strategy:
60+
fail-fast: false
61+
matrix:
62+
include:
63+
- operating-system: 'ubuntu-latest'
64+
silverstripe-version: '5.0'
65+
php-version: '8.1'
66+
- operating-system: 'ubuntu-latest'
67+
silverstripe-version: '4.0'
68+
php-version: '8.0'
69+
- operating-system: 'ubuntu-latest'
70+
silverstripe-version: '4.0'
71+
php-version: '7.4'
8872

73+
name: SS ${{ matrix.silverstripe-version }}, PHP ${{ matrix.php-version }}
74+
runs-on: ${{ matrix.operating-system }}
75+
steps:
76+
- uses: actions/checkout@v3
77+
- uses: php-actions/composer@v6
78+
with:
79+
command: update
80+
--with silverstripe/framework:^${{ matrix.silverstripe-version }}
81+
php_version: ${{ matrix.php-version }}
82+
php_extensions: intl
83+
- run: |
84+
./vendor/bin/phpunit -c phpunit.xml.dist
85+
86+
merge:
8987
name: "Merge Changes"
9088
if: github.event_name == 'push'
91-
needs: [test]
89+
needs: [latest,matrix]
9290
runs-on: 'ubuntu-latest'
9391
steps:
9492
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)