From b1e1cecedf5eb26cfec33b09578a69fc9ac31b8e Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 21:44:25 +0200 Subject: [PATCH 1/6] Run SQLite 3 and mssql steps on ubuntu-24.04 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 56801d3..8413123 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -305,7 +305,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved + runs-on: ubuntu-24.04 strategy: matrix: include: From c3c1bee9ffd317db6dc80b493157cd2c21a05875 Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 21:52:41 +0200 Subject: [PATCH 2/6] Run MSSQL tests on ubuntu-20.04 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8413123..afa15de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -305,7 +305,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-24.04 + runs-on: ubuntu-20.04 strategy: matrix: include: From 675379052a71af14b8cee319fb273cc6cbffba54 Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 21:58:29 +0200 Subject: [PATCH 3/6] Only run MSSQL 2022 tests --- .github/workflows/tests.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index afa15de..5c067e3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -305,24 +305,21 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: - php: '8.1' db: "sqlite3" - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2017-latest" - db_alias: 'MSSQL 2017' - - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" - db_alias: 'MSSQL 2019' + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" + db_alias: 'MSSQL 2022' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" From a3606aab976b53f33e9a2b863f31cf022123c125 Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 22:06:02 +0200 Subject: [PATCH 4/6] Update if statements in MSSQL tests for MSSQL 2022 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c067e3..20fc31d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -319,7 +319,7 @@ jobs: services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -359,7 +359,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] then db='mssql' else From d25ad0cdfdcfd48201d2b0cb43a7739b3dd79cd8 Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 22:21:54 +0200 Subject: [PATCH 5/6] Always use ${{ matrix.db }} for MSSQL --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 20fc31d..79327e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -319,7 +319,7 @@ jobs: services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} + image: ${{ matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" From 5084fd1aaecc86fc61eb9cff124809471cd43f49 Mon Sep 17 00:00:00 2001 From: Derk Date: Fri, 6 Jun 2025 22:26:04 +0200 Subject: [PATCH 6/6] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79327e8..397c545 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -319,7 +319,7 @@ jobs: services: mssql: - image: ${{ matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y"