From f1a62229a9893f5640cf375a0df50bd1aa46c8df Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 25 Jul 2025 23:12:00 +0200 Subject: [PATCH] build: Sentry-CI-Build-Linux-NoMobile.slnf --- .github/workflows/build.yml | 6 +- ...lnf => Sentry-CI-Build-Linux-NoMobile.slnf | 2 +- Sentry-CI-Build-Linux-musl.slnf | 72 ------------------- scripts/generate-solution-filters-config.yaml | 18 +---- 4 files changed, 6 insertions(+), 92 deletions(-) rename Sentry-CI-Build-Linux-arm64.slnf => Sentry-CI-Build-Linux-NoMobile.slnf (99%) delete mode 100644 Sentry-CI-Build-Linux-musl.slnf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 649fbec18f..dc93dc464e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,17 +86,17 @@ jobs: slnf: Sentry-CI-Build-Linux.slnf - os: ubuntu-22.04-arm rid: linux-arm64 - slnf: Sentry-CI-Build-Linux-arm64.slnf + slnf: Sentry-CI-Build-Linux-NoMobile.slnf - os: ubuntu-latest rid: linux-musl-x64 - slnf: Sentry-CI-Build-Linux-musl.slnf + slnf: Sentry-CI-Build-Linux-NoMobile.slnf container: image: ghcr.io/getsentry/sentry-dotnet-alpine:3.21 volumes: - /var/run/docker.sock:/var/run/docker.sock - os: ubuntu-24.04-arm rid: linux-musl-arm64 - slnf: Sentry-CI-Build-Linux-musl.slnf + slnf: Sentry-CI-Build-Linux-NoMobile.slnf container: image: ghcr.io/getsentry/sentry-dotnet-alpine:3.21 volumes: diff --git a/Sentry-CI-Build-Linux-arm64.slnf b/Sentry-CI-Build-Linux-NoMobile.slnf similarity index 99% rename from Sentry-CI-Build-Linux-arm64.slnf rename to Sentry-CI-Build-Linux-NoMobile.slnf index 485f9e14a5..f29fd0a74e 100644 --- a/Sentry-CI-Build-Linux-arm64.slnf +++ b/Sentry-CI-Build-Linux-NoMobile.slnf @@ -1,6 +1,6 @@ { "solution": { - "path": "Sentry.sln", + "path": ".generated.NoMobile.sln", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", diff --git a/Sentry-CI-Build-Linux-musl.slnf b/Sentry-CI-Build-Linux-musl.slnf deleted file mode 100644 index 485f9e14a5..0000000000 --- a/Sentry-CI-Build-Linux-musl.slnf +++ /dev/null @@ -1,72 +0,0 @@ -{ - "solution": { - "path": "Sentry.sln", - "projects": [ - "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", - "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", - "samples\\Sentry.Samples.AspNetCore.Blazor.Server\\Sentry.Samples.AspNetCore.Blazor.Server.csproj", - "samples\\Sentry.Samples.AspNetCore.Blazor.Wasm\\Sentry.Samples.AspNetCore.Blazor.Wasm.csproj", - "samples\\Sentry.Samples.AspNetCore.Grpc\\Sentry.Samples.AspNetCore.Grpc.csproj", - "samples\\Sentry.Samples.AspNetCore.Mvc\\Sentry.Samples.AspNetCore.Mvc.csproj", - "samples\\Sentry.Samples.AspNetCore.Serilog\\Sentry.Samples.AspNetCore.Serilog.csproj", - "samples\\Sentry.Samples.AspNetCore.WebAPI.Profiling\\Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj", - "samples\\Sentry.Samples.Aws.Lambda.AspNetCoreServer\\Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj", - "samples\\Sentry.Samples.Azure.Functions.Worker\\Sentry.Samples.Azure.Functions.Worker.csproj", - "samples\\Sentry.Samples.Console.Basic\\Sentry.Samples.Console.Basic.csproj", - "samples\\Sentry.Samples.Console.Customized\\Sentry.Samples.Console.Customized.csproj", - "samples\\Sentry.Samples.Console.HeapDump\\Sentry.Samples.Console.HeapDump.csproj", - "samples\\Sentry.Samples.Console.Native\\Sentry.Samples.Console.Native.csproj", - "samples\\Sentry.Samples.Console.Profiling\\Sentry.Samples.Console.Profiling.csproj", - "samples\\Sentry.Samples.EntityFramework\\Sentry.Samples.EntityFramework.csproj", - "samples\\Sentry.Samples.GenericHost\\Sentry.Samples.GenericHost.csproj", - "samples\\Sentry.Samples.Google.Cloud.Functions\\Sentry.Samples.Google.Cloud.Functions.csproj", - "samples\\Sentry.Samples.GraphQL.Client.Http\\Sentry.Samples.GraphQL.Client.Http.csproj", - "samples\\Sentry.Samples.GraphQL.Server\\Sentry.Samples.GraphQL.Server.csproj", - "samples\\Sentry.Samples.Hangfire\\Sentry.Samples.Hangfire.csproj", - "samples\\Sentry.Samples.Log4Net\\Sentry.Samples.Log4Net.csproj", - "samples\\Sentry.Samples.ME.Logging\\Sentry.Samples.ME.Logging.csproj", - "samples\\Sentry.Samples.NLog\\Sentry.Samples.NLog.csproj", - "samples\\Sentry.Samples.OpenTelemetry.AspNetCore\\Sentry.Samples.OpenTelemetry.AspNetCore.csproj", - "samples\\Sentry.Samples.OpenTelemetry.Console\\Sentry.Samples.OpenTelemetry.Console.csproj", - "samples\\Sentry.Samples.Serilog\\Sentry.Samples.Serilog.csproj", - "src\\Sentry.Analyzers\\Sentry.Analyzers.csproj", - "src\\Sentry.AspNetCore.Blazor.WebAssembly\\Sentry.AspNetCore.Blazor.WebAssembly.csproj", - "src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj", - "src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj", - "src\\Sentry.Azure.Functions.Worker\\Sentry.Azure.Functions.Worker.csproj", - "src\\Sentry.DiagnosticSource\\Sentry.DiagnosticSource.csproj", - "src\\Sentry.EntityFramework\\Sentry.EntityFramework.csproj", - "src\\Sentry.Extensions.Logging\\Sentry.Extensions.Logging.csproj", - "src\\Sentry.Google.Cloud.Functions\\Sentry.Google.Cloud.Functions.csproj", - "src\\Sentry.Hangfire\\Sentry.Hangfire.csproj", - "src\\Sentry.Log4Net\\Sentry.Log4Net.csproj", - "src\\Sentry.NLog\\Sentry.NLog.csproj", - "src\\Sentry.OpenTelemetry\\Sentry.OpenTelemetry.csproj", - "src\\Sentry.Profiling\\Sentry.Profiling.csproj", - "src\\Sentry.Serilog\\Sentry.Serilog.csproj", - "src\\Sentry.SourceGenerators\\Sentry.SourceGenerators.csproj", - "src\\Sentry\\Sentry.csproj", - "test\\Sentry.Analyzers.Tests\\Sentry.Analyzers.Tests.csproj", - "test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj", - "test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj", - "test\\Sentry.AspNetCore.TestUtils\\Sentry.AspNetCore.TestUtils.csproj", - "test\\Sentry.Azure.Functions.Worker.Tests\\Sentry.Azure.Functions.Worker.Tests.csproj", - "test\\Sentry.DiagnosticSource.IntegrationTests\\Sentry.DiagnosticSource.IntegrationTests.csproj", - "test\\Sentry.DiagnosticSource.Tests\\Sentry.DiagnosticSource.Tests.csproj", - "test\\Sentry.EntityFramework.Tests\\Sentry.EntityFramework.Tests.csproj", - "test\\Sentry.Extensions.Logging.Tests\\Sentry.Extensions.Logging.Tests.csproj", - "test\\Sentry.Google.Cloud.Functions.Tests\\Sentry.Google.Cloud.Functions.Tests.csproj", - "test\\Sentry.Hangfire.Tests\\Sentry.Hangfire.Tests.csproj", - "test\\Sentry.Log4Net.Tests\\Sentry.Log4Net.Tests.csproj", - "test\\Sentry.NLog.Tests\\Sentry.NLog.Tests.csproj", - "test\\Sentry.OpenTelemetry.Tests\\Sentry.OpenTelemetry.Tests.csproj", - "test\\Sentry.Profiling.Tests\\Sentry.Profiling.Tests.csproj", - "test\\Sentry.Serilog.Tests\\Sentry.Serilog.Tests.csproj", - "test\\Sentry.SourceGenerators.Tests\\Sentry.SourceGenerators.Tests.csproj", - "test\\Sentry.Testing.CrashableApp\\Sentry.Testing.CrashableApp.csproj", - "test\\Sentry.Testing\\Sentry.Testing.csproj", - "test\\Sentry.Tests\\Sentry.Tests.csproj", - "test\\SingleFileTestApp\\SingleFileTestApp.csproj" - ] - } -} diff --git a/scripts/generate-solution-filters-config.yaml b/scripts/generate-solution-filters-config.yaml index 1cfee815c1..da07eaaa75 100644 --- a/scripts/generate-solution-filters-config.yaml +++ b/scripts/generate-solution-filters-config.yaml @@ -50,22 +50,8 @@ filterConfigs: - "**/*DeviceTests*.csproj" - "**/*Maui.Device.TestApp.csproj" - - outputPath: Sentry-CI-Build-Linux-arm64.slnf - include: - groups: - - "allProjects" - exclude: - groups: - - "macOnly" - - "windowsOnly" - - "artefacts" - - "trimTests" - patterns: - - "**/*Android*.csproj" - - "**/*DeviceTests*.csproj" - - "**/*Maui*.csproj" - - - outputPath: Sentry-CI-Build-Linux-musl.slnf + - outputPath: Sentry-CI-Build-Linux-NoMobile.slnf + solution: .generated.NoMobile.sln include: groups: - "allProjects"