Skip to content

Commit 18ead28

Browse files
Removed special handling for musl (until next year)
1 parent 167cee8 commit 18ead28

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -265,21 +265,22 @@ jobs:
265265
path: src
266266

267267
- name: Integration test
268-
if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
268+
# # Note that when upgsading .NET versions, linux-musl may need special handling... see comments below
269+
# if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
269270
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
270271
with:
271272
path: integration-test
272273

273-
# For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
274-
# these don't conform to the normal naming conventions and don't get resolved automatically. We do
275-
# by passing it as parameter to aot.Tests.ps1 via an environment variable
276-
- name: Integration test (musl)
277-
if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
278-
uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
279-
env:
280-
ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
281-
with:
282-
path: integration-test
274+
# # For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
275+
# # these don't conform to the normal naming conventions and don't get resolved automatically. We do
276+
# # by passing it as parameter to aot.Tests.ps1 via an environment variable
277+
# - name: Integration test (musl)
278+
# if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
279+
# uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
280+
# env:
281+
# ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
282+
# with:
283+
# path: integration-test
283284

284285
ms-build:
285286
needs: build-sentry-native

0 commit comments

Comments
 (0)