Merge branch 'main' into fix/issue-233-followup

staudenmeir · Sep 7, 2024 · 9111f06 · 9111f06
2 parents 156dd5e + 04526cb
commit 9111f06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,11 @@ jobs:
     strategy:
       matrix:
         php: [ 8.4, 8.3, 8.2 ]
-        database: [ mysql, mariadb, pgsql, sqlite, singlestore ] # TODO[L11]: firebird
+        database: [ mysql, mariadb, pgsql, sqlite, sqlsrv, singlestore, firebird ]
         release: [ stable, lowest ]
+        exclude:
+          - php: 8.4
+            database: firebird
         include:
           - php: 8.3
             release: stable
@@ -28,7 +31,7 @@ jobs:
         run: docker compose -f docker-compose.yml -f docker-compose.ci.yml up --wait ${{ matrix.database }}
         if: matrix.database != 'sqlite'
       - name: Create SQL Server database
-        run: docker compose exec sqlsrv /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P Password! -Q 'create database [test]'
+        run: docker compose exec sqlsrv /opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -U sa -P Password! -Q 'CREATE DATABASE [test]'
         if: matrix.database == 'sqlsrv'
       - name: Install dependencies
         run: |

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,12 +51,12 @@ services:
     networks:
       - test
   sqlsrv:
-    image: 'mcr.microsoft.com/mssql/server:2019-latest'
+    image: 'mcr.microsoft.com/mssql/server:2022-latest'
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: Password!
     healthcheck:
-      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$${SA_PASSWORD}" -Q "SELECT 1" -b -o /dev/null
+      test: /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P "$${SA_PASSWORD}" -Q "SELECT 1" -b -o /dev/null
       interval: 5s
       timeout: 3s
       retries: 10