Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/workflows/CodeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,19 @@ jobs:
run: dotnet restore integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln

- name: Run Integration Tests
run: dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests.sln --logger "trx;LogFileName=test_results.trx" --verbosity detailed
run: |
set +e
dotnet test integration-tests/IntegrationTestSuite/MessagePackIntegrationTests/MessagePackIntegrationTests.csproj \
--settings integration-tests/IntegrationTestSuite/.runsettings \
--logger "trx;LogFileName=msgpack_results.trx" --verbosity detailed
MESSAGEPACK_EXIT=$?
dotnet test integration-tests/IntegrationTestSuite/WebservicesIntegrationTests/WebservicesIntegrationTests.csproj \
--settings integration-tests/IntegrationTestSuite/.runsettings \
--logger "trx;LogFileName=test_results.trx" --verbosity detailed
WEBSERVICES_EXIT=$?
echo "MessagePackIntegrationTests exit code: $MESSAGEPACK_EXIT"
echo "WebservicesIntegrationTests exit code: $WEBSERVICES_EXIT"
[ $MESSAGEPACK_EXIT -eq 0 ] && [ $WEBSERVICES_EXIT -eq 0 ]

- name: Shutdown Integration Test session
run: dotnet-coverage shutdown integrationtestsession
Expand Down
4 changes: 2 additions & 2 deletions CometServer/CometServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Carter" Version="10.0.0" />
<PackageReference Include="CDP4MessagePackSerializer-CE" Version="30.1.0" />
<PackageReference Include="CDP4MessagePackSerializer-CE" Version="30.1.2" />
<PackageReference Include="CDP4ServicesMessaging-CE" Version="30.1.0" />
<PackageReference Include="FluentResults" Version="4.0.0" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
Expand Down Expand Up @@ -93,4 +93,4 @@
<Exec Command="dotnet $(VersionFileCreatorDllPath) path:$(OutDir) " YieldDuringToolExecution="True" ConsoleToMSBuild="True" />
<Message Importance="High" Text="------ VersionFileCreator tool Finished ------ " />
</Target>
</Project>
</Project>
14 changes: 1 addition & 13 deletions CometServer/appsettings.Production.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,7 @@
},
"WriteTo": [
{
"Name": "GrafanaLoki",
"Args": {
"uri": "http://localhost:3100",
"labels": [
{
"key": "app",
"value": "CDP4-COMET WebServices-01"
}
],
"propertiesAsLabels": [
"app"
]
}
"Name": "Console"
}
],
"WriteTo:Async": {
Expand Down
Loading