Skip to content

Commit 6ed730b

Browse files
committed
Merge branch '3.10.x' into 4.4.x
* 3.10.x: Test against SQL Server 2025 (doctrine#7265)
2 parents 15a2764 + a1e252d commit 6ed730b

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@ jobs:
241241

242242
phpunit-mssql:
243243
name: >
244-
${{ format('SQL Server - PHP {0} - ext. {1} - collation. {2}',
244+
${{ format('SQL Server {0} - PHP {1} - ext. {2} - collation. {3}',
245+
matrix.sqlserver-version || 'Ø',
245246
matrix.php-version || 'Ø',
246247
matrix.extension || 'Ø',
247248
matrix.collation || 'Ø'
@@ -250,6 +251,7 @@ jobs:
250251
uses: ./.github/workflows/phpunit-sqlserver.yml
251252
with:
252253
php-version: ${{ matrix.php-version }}
254+
sqlserver-version: ${{ matrix.sqlserver-version }}
253255
extension: ${{ matrix.extension }}
254256
collation: ${{ matrix.collation }}
255257

@@ -260,6 +262,9 @@ jobs:
260262
- "8.3"
261263
- "8.4"
262264
- "8.5"
265+
sqlserver-version:
266+
- "2022"
267+
- "2025"
263268
extension:
264269
- "sqlsrv"
265270
- "pdo_sqlsrv"
@@ -268,9 +273,11 @@ jobs:
268273
include:
269274
- collation: "Latin1_General_100_CS_AS_SC_UTF8"
270275
php-version: "8.2"
276+
sqlserver-version: "2025"
271277
extension: "sqlsrv"
272278
- collation: "Latin1_General_100_CS_AS_SC_UTF8"
273279
php-version: "8.2"
280+
sqlserver-version: "2025"
274281
extension: "pdo_sqlsrv"
275282

276283
phpunit-db2:

.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)