|
16 | 16 |
|
17 | 17 | jobs:
|
18 | 18 |
|
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" |
52 | 21 | runs-on: 'ubuntu-latest'
|
53 | 22 | steps:
|
54 | 23 | - uses: actions/checkout@v3
|
55 | 24 | - uses: php-actions/composer@v6
|
56 | 25 | with:
|
57 | 26 | command: update
|
58 | 27 | --with silverstripe/framework:^5.0
|
59 |
| - php_version: 8.1 |
| 28 | + php_version: 8.2 |
60 | 29 | php_extensions: xdebug intl
|
61 | 30 | - name: Generate Code Coverage
|
62 | 31 | run: |
|
@@ -84,11 +53,40 @@ jobs:
|
84 | 53 | git push origin HEAD:${{ github.head_ref || github.ref_name }} \
|
85 | 54 | )
|
86 | 55 |
|
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' |
88 | 72 |
|
| 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: |
89 | 87 | name: "Merge Changes"
|
90 | 88 | if: github.event_name == 'push'
|
91 |
| - needs: [test] |
| 89 | + needs: [latest,matrix] |
92 | 90 | runs-on: 'ubuntu-latest'
|
93 | 91 | steps:
|
94 | 92 | - uses: actions/checkout@v3
|
|
0 commit comments