From d03e6d4ecf385fc904cda1d9421058dfc9aa48a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Tue, 19 Dec 2023 19:36:47 +0100 Subject: [PATCH] Reverting to SQL express. --- .github/actions/setup-sql-server/Initialize-SqlServer.ps1 | 5 +++-- .github/actions/setup-sql-server/Wait-SqlServer.ps1 | 2 +- .github/actions/test-dotnet/Invoke-SolutionTests.ps1 | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-sql-server/Initialize-SqlServer.ps1 b/.github/actions/setup-sql-server/Initialize-SqlServer.ps1 index b92897386..5c8de90fb 100644 --- a/.github/actions/setup-sql-server/Initialize-SqlServer.ps1 +++ b/.github/actions/setup-sql-server/Initialize-SqlServer.ps1 @@ -1,10 +1,11 @@ param ( - [string]$sqlServerVersion = '2022' + [string]$sqlServerVersion = '2022', + [string]$sqlServerVersionNumber = '2022.16.0.1000' ) if ($Env:RUNNER_OS -eq 'Windows') { - choco install sql-server-2022 --no-progress + choco install sql-server-express --version=$sqlServerVersionNumber --no-progress } else { diff --git a/.github/actions/setup-sql-server/Wait-SqlServer.ps1 b/.github/actions/setup-sql-server/Wait-SqlServer.ps1 index 61b6a57ff..61a26a968 100644 --- a/.github/actions/setup-sql-server/Wait-SqlServer.ps1 +++ b/.github/actions/setup-sql-server/Wait-SqlServer.ps1 @@ -6,7 +6,7 @@ for ($i = 1; $i -le $maxTryCount; $i++) if ($Env:RUNNER_OS -eq 'Windows') { - sqlcmd -b -Q 'SELECT @@SERVERNAME as ServerName' 2>&1>$null + sqlcmd -b -S .\SQLEXPRESS -Q 'SELECT @@SERVERNAME as ServerName' 2>&1>$null } else { diff --git a/.github/actions/test-dotnet/Invoke-SolutionTests.ps1 b/.github/actions/test-dotnet/Invoke-SolutionTests.ps1 index a610e4d8e..def08fbd7 100644 --- a/.github/actions/test-dotnet/Invoke-SolutionTests.ps1 +++ b/.github/actions/test-dotnet/Invoke-SolutionTests.ps1 @@ -16,7 +16,7 @@ $connectionStringSuffix = @( ) -join '' if ($Env:RUNNER_OS -eq 'Windows') { - $connectionStringStem = 'Server=.\.;Database=LombiqUITestingToolbox_{{id}};Integrated Security=True' + $connectionStringStem = 'Server=.\SQLEXPRESS;Database=LombiqUITestingToolbox_{{id}};Integrated Security=True' } else {