From d553431a4da0ecee271f082665570d33c958fa53 Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sat, 7 Sep 2024 15:04:32 +0200 Subject: [PATCH] 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 d2a9e17..8d55b21 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 27956f2..2424d10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,12 +51,12 @@ services: networks: - test sqlsrv: - image: 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-20.04' + 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