Skip to content

Commit a28a545

Browse files
committed
Merge branch '4.5.x' into 5.0.x
* 4.5.x: Test against SQL Server 2025 (doctrine#7265)
2 parents 61fb4be + 207d910 commit a28a545

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ jobs:
205205

206206
phpunit-mssql:
207207
name: >
208-
${{ format('SQL Server - PHP {0} - ext. {1} - collation. {2}',
208+
${{ format('SQL Server {0} - PHP {1} - ext. {2} - collation. {3}',
209+
matrix.sqlserver-version || 'Ø',
209210
matrix.php-version || 'Ø',
210211
matrix.extension || 'Ø',
211212
matrix.collation || 'Ø'
@@ -214,6 +215,7 @@ jobs:
214215
uses: ./.github/workflows/phpunit-sqlserver.yml
215216
with:
216217
php-version: ${{ matrix.php-version }}
218+
sqlserver-version: ${{ matrix.sqlserver-version }}
217219
extension: ${{ matrix.extension }}
218220
collation: ${{ matrix.collation }}
219221

@@ -222,6 +224,9 @@ jobs:
222224
php-version:
223225
- "8.4"
224226
- "8.5"
227+
sqlserver-version:
228+
- "2022"
229+
- "2025"
225230
extension:
226231
- "sqlsrv"
227232
- "pdo_sqlsrv"

.github/workflows/phpunit-sqlserver.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
php-version:
77
required: true
88
type: string
9+
sqlserver-version:
10+
required: true
11+
type: string
912
extension:
1013
required: true
1114
type: string
@@ -19,7 +22,7 @@ jobs:
1922

2023
services:
2124
sqlserver:
22-
image: mcr.microsoft.com/mssql/server:2022-latest
25+
image: mcr.microsoft.com/mssql/server:${{ inputs.sqlserver-version }}-latest
2326
ports:
2427
- '1433:1433'
2528
env:
@@ -55,5 +58,5 @@ jobs:
5558
- name: Upload coverage file
5659
uses: actions/upload-artifact@v6
5760
with:
58-
name: ${{ github.job }}-php-${{ inputs.php-version }}-${{ inputs.extension }}-${{ inputs.collation }}.coverage
61+
name: ${{ github.job }}-${{ inputs.sqlserver-version }}-php-${{ inputs.php-version }}-${{ inputs.extension }}-${{ inputs.collation }}.coverage
5962
path: coverage.xml

0 commit comments

Comments
 (0)