Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-24 12:35:25 +01:00
Code Issues Projects Releases Wiki Activity

Move CI testing to Ubuntu (#2638)

Browse Source 
Change the CI for testing job from Windows to Ubuntu
This commit is contained in:
Oscar Hinton 2023-01-30 11:07:20 +01:00 committed by GitHub
parent 2646d9200c
commit 9ea520e038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
testing: testing:
name: Testing name: Testing
runs-on: windows-2022 runs-on: ubuntu-22.04
env: env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps: steps:
@ -46,13 +46,10 @@ jobs:
uses: actions/setup-dotnet@9211491ffb35dd6a6657ca4f45d43dfe6e97c829 uses: actions/setup-dotnet@9211491ffb35dd6a6657ca4f45d43dfe6e97c829
with: with:
dotnet-version: "6.0.x" dotnet-version: "6.0.x"
- name: Set up MSBuild
uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab
- name: Print environment - name: Print environment
run: | run: |
dotnet --info dotnet --info
msbuild -version
nuget help | grep Version nuget help | grep Version
echo "GitHub ref: $GITHUB_REF" echo "GitHub ref: $GITHUB_REF"
echo "GitHub event: $GITHUB_EVENT" echo "GitHub event: $GITHUB_EVENT"
@ -64,20 +61,23 @@ jobs:
run: dotnet restore --locked-mode run: dotnet restore --locked-mode
shell: pwsh shell: pwsh
- name: Remove SQL proj
run: dotnet sln bitwarden-server.sln remove src/Sql/Sql.sqlproj
- name: Build OSS solution - name: Build OSS solution
run: msbuild bitwarden-server.sln /p:Configuration=Debug /p:DefineConstants="OSS" /verbosity:minimal run: dotnet build bitwarden-server.sln -p:Configuration=Debug -p:DefineConstants="OSS" --verbosity minimal
shell: pwsh shell: pwsh
- name: Build solution - name: Build solution
run: msbuild bitwarden-server.sln /p:Configuration=Debug /verbosity:minimal run: dotnet build bitwarden-server.sln -p:Configuration=Debug --verbosity minimal
shell: pwsh shell: pwsh
- name: Test OSS solution - name: Test OSS solution
run: dotnet test ./test --configuration Debug --no-build --logger "trx;LogFileName=oss-test-results.trx" || true run: dotnet test ./test --configuration Debug --no-build --logger "trx;LogFileName=oss-test-results.trx"
shell: pwsh shell: pwsh
- name: Test Bitwarden solution - name: Test Bitwarden solution
run: dotnet test ./bitwarden_license/test --configuration Debug --no-build --logger "trx;LogFileName=bw-test-results.trx" || true run: dotnet test ./bitwarden_license/test --configuration Debug --no-build --logger "trx;LogFileName=bw-test-results.trx"
shell: pwsh shell: pwsh
- name: Report test results - name: Report test results

5
test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
View File

@ -8,6 +8,8 @@ using Microsoft.AspNetCore.TestHost;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace Bit.IntegrationTestCommon.Factories; namespace Bit.IntegrationTestCommon.Factories;
@ -108,6 +110,9 @@ public abstract class WebApplicationFactoryBase<T> : WebApplicationFactory<T>
// Fix IP Rate Limiting // Fix IP Rate Limiting
services.AddSingleton<IStartupFilter, CustomStartupFilter>(); services.AddSingleton<IStartupFilter, CustomStartupFilter>();
// Disable logs
services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
}); });
} }