From 1880200ec395b16632bd3937d424ccaf7d179acd Mon Sep 17 00:00:00 2001 From: Bratchikov Igor <837035+bratchikov@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:50:17 +0500 Subject: [PATCH 1/2] Update build.yml --- .github/workflows/build.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5dc2f78..6d4cd251 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,11 @@ jobs: with: dotnet-version: 7.0.x + - name: Install .NET 8.0 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.x + - name: Restore NewPlatform.Flexberry.ORM.ODataService.sln run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln @@ -90,6 +95,9 @@ jobs: - name: Test on dotnet 7.0 run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net7.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll + - name: Test on dotnet 7.0 + run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net8.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll + - name: Test under mono run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll @@ -149,6 +157,11 @@ jobs: with: dotnet-version: 7.0.x + - name: Install .NET 8.0 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.x + - name: Restore NewPlatform.Flexberry.ORM.ODataService.sln run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln @@ -167,6 +180,9 @@ jobs: - name: Test on dotnet 7.0 run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net7.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll + - name: Test on dotnet 8.0 + run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net8.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll + - name: Test under mono run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll From 9fe33a5303ed66c5b244b5ca8d5c414a80c7aaeb Mon Sep 17 00:00:00 2001 From: Bratchikov Igor <837035+bratchikov@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:05:25 +0500 Subject: [PATCH 2/2] Update build.yml to use mssql 2022 --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d4cd251..94d274ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: - name: Test on dotnet 7.0 run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net7.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll - - name: Test on dotnet 7.0 + - name: Test on dotnet 8.0 run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net8.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll - name: Test under mono @@ -114,14 +114,14 @@ jobs: # Label used to access the service container mssql: # Docker Hub image - image: mcr.microsoft.com/mssql/server:2019-latest + image: mcr.microsoft.com/mssql/server:2022-latest # Provide the password for mssql env: ACCEPT_EULA: Y - SA_PASSWORD: p@ssw0rd + MSSQL_SA_PASSWORD: p@ssw0rd # Set health checks to wait until mssql has started options: >- - --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q 'SELECT 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P ${MSSQL_SA_PASSWORD} -Q 'SELECT 1' -b -o /dev/null" --health-interval 10s --health-timeout 5s --health-retries 5