From 4947d4c97b9379cdf92721620d70d8f4c6a005dc Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sat, 7 Sep 2024 15:09:36 +0200 Subject: [PATCH 1/4] Fix SQL Server tests --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c7b944..b169794 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,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 index 9d998e7..7beb13a 100644 --- 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 From 64765cf63ec6067070045795826658332c2ebfcc Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sat, 7 Sep 2024 15:18:40 +0200 Subject: [PATCH 2/4] Restore SQL Server tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b169794..59996bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ 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 ] # TODO[L11]: firebird release: [ stable, lowest ] include: - php: 8.3 From 6a8964e118b0c996064986c31851cb1a168b3daa Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sat, 7 Sep 2024 15:19:15 +0200 Subject: [PATCH 3/4] Restore Firebird tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59996bf..8dc56dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: [ 8.4, 8.3, 8.2 ] - database: [ mysql, mariadb, pgsql, sqlite, sqlsrv, singlestore ] # TODO[L11]: firebird + database: [ mysql, mariadb, pgsql, sqlite, sqlsrv, singlestore, firebird ] release: [ stable, lowest ] include: - php: 8.3 From 04526cb6932841b7117f3f885f8d37da1706d1f3 Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sat, 7 Sep 2024 15:23:59 +0200 Subject: [PATCH 4/4] Restore Firebird tests --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dc56dd..56bda14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,9 @@ jobs: php: [ 8.4, 8.3, 8.2 ] database: [ mysql, mariadb, pgsql, sqlite, sqlsrv, singlestore, firebird ] release: [ stable, lowest ] + exclude: + - php: 8.4 + database: firebird include: - php: 8.3 release: stable