From 0ff84eb56c5a7bd45353e5087b4b370255a300fd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 16 Feb 2026 10:34:34 +0100 Subject: [PATCH 1/9] deps(sentry-native): checkout fix/split_inproc_handler_thread https://github.com/getsentry/sentry-native/pull/1446 --- modules/sentry-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sentry-native b/modules/sentry-native index 5bae413975..69e16194e8 160000 --- a/modules/sentry-native +++ b/modules/sentry-native @@ -1 +1 @@ -Subproject commit 5bae413975dc010d8e2d5646316e35141ae2ebb7 +Subproject commit 69e16194e87508a12c192a3b3e64fe6e2f40dd8a From 28c629c395d9d6f2d8aefb4dff18794bd3417150 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 16 Feb 2026 10:54:34 +0100 Subject: [PATCH 2/9] ci: install libunwind-dev and liblzma-dev on Linux --- .github/actions/environment/action.yml | 7 +++++++ .github/workflows/build.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml index 3b5f91a5f1..e5905fc65f 100644 --- a/.github/actions/environment/action.yml +++ b/.github/actions/environment/action.yml @@ -30,6 +30,13 @@ runs: shell: bash run: sudo ./scripts/install-libssl1.sh + - name: Install Linux dependencies + if: ${{ runner.os == 'Linux' && !matrix.container }} + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y libunwind-dev liblzma-dev + - name: Install Linux ARM 32-bit dependencies if: ${{ matrix.rid == 'linux-arm' }} shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4065a4c7a..cfbeef7c4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,13 @@ jobs: - run: git submodule update --init modules/sentry-native + - name: Install Linux dependencies + if: ${{ runner.os == 'Linux' && !matrix.container }} + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y libunwind-dev liblzma-dev + # zstd is needed for cross OS actions/cache but missing from windows-11-arm # https://github.com/actions/partner-runner-images/issues/99 - name: Install zstd on Windows ARM64 From 18b053f88583f8a0e5fbbddb017cba9cfa17f58b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 16 Feb 2026 10:49:36 +0100 Subject: [PATCH 3/9] build: adapt Sentry.Native.targets --- .../Native/buildTransitive/Sentry.Native.targets | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets index 69578bb60a..110d04252d 100644 --- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets +++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets @@ -51,14 +51,10 @@ - + - - - - - - + From e8d8c7a2d8d07e0fdaf20289229902078e2a8e98 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 16 Feb 2026 15:21:25 +0100 Subject: [PATCH 4/9] Enable diagnostic verbosity --- integration-test/runtime.Tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-test/runtime.Tests.ps1 b/integration-test/runtime.Tests.ps1 index 0fa357c3fa..b08478dd48 100644 --- a/integration-test/runtime.Tests.ps1 +++ b/integration-test/runtime.Tests.ps1 @@ -88,6 +88,7 @@ internal class FakeTransport : ITransport -c Release ` --nologo ` --framework $framework ` + --verbosity diagnostic ` -p:SentryNative=$($SentryNative.ToString().ToLower()) ` | ForEach-Object { Write-Host $_ } if ($LASTEXITCODE -ne 0) From d3849116777ec7a5cec545f1bb7126e466d5c040 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Feb 2026 07:41:05 +0100 Subject: [PATCH 5/9] sentry-native: vendor_libunwind https://github.com/getsentry/sentry-native/pull/1523 --- modules/sentry-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sentry-native b/modules/sentry-native index 69e16194e8..2a9585cdc3 160000 --- a/modules/sentry-native +++ b/modules/sentry-native @@ -1 +1 @@ -Subproject commit 69e16194e87508a12c192a3b3e64fe6e2f40dd8a +Subproject commit 2a9585cdc35c4a50be06b3d168d8c4f5779325a6 From c69de9393dffeaa8df274b21cfb8acfc39c29e4b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Feb 2026 07:42:06 +0100 Subject: [PATCH 6/9] Revert "ci: install libunwind-dev and liblzma-dev on Linux" This reverts commit 5746009bfedccc2ce8cec7bef510982dafb0961a. --- .github/actions/environment/action.yml | 7 ------- .github/workflows/build.yml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml index e5905fc65f..3b5f91a5f1 100644 --- a/.github/actions/environment/action.yml +++ b/.github/actions/environment/action.yml @@ -30,13 +30,6 @@ runs: shell: bash run: sudo ./scripts/install-libssl1.sh - - name: Install Linux dependencies - if: ${{ runner.os == 'Linux' && !matrix.container }} - shell: bash - run: | - sudo apt-get update - sudo apt-get install -y libunwind-dev liblzma-dev - - name: Install Linux ARM 32-bit dependencies if: ${{ matrix.rid == 'linux-arm' }} shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfbeef7c4b..a4065a4c7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,13 +52,6 @@ jobs: - run: git submodule update --init modules/sentry-native - - name: Install Linux dependencies - if: ${{ runner.os == 'Linux' && !matrix.container }} - shell: bash - run: | - sudo apt-get update - sudo apt-get install -y libunwind-dev liblzma-dev - # zstd is needed for cross OS actions/cache but missing from windows-11-arm # https://github.com/actions/partner-runner-images/issues/99 - name: Install zstd on Windows ARM64 From 31652618ed4cbbea10bb4879dc8ca113e80194ec Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Feb 2026 07:42:08 +0100 Subject: [PATCH 7/9] Revert "Enable diagnostic verbosity" This reverts commit 288a6851ed173d4d829d85a1367d96809b021fc0. --- integration-test/runtime.Tests.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/integration-test/runtime.Tests.ps1 b/integration-test/runtime.Tests.ps1 index b08478dd48..0fa357c3fa 100644 --- a/integration-test/runtime.Tests.ps1 +++ b/integration-test/runtime.Tests.ps1 @@ -88,7 +88,6 @@ internal class FakeTransport : ITransport -c Release ` --nologo ` --framework $framework ` - --verbosity diagnostic ` -p:SentryNative=$($SentryNative.ToString().ToLower()) ` | ForEach-Object { Write-Host $_ } if ($LASTEXITCODE -ne 0) From 0ba234de2e32bcf327339fdd06dfd3ddb61917fe Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Feb 2026 08:12:41 +0100 Subject: [PATCH 8/9] Adapt build-sentry-native.ps1 & Sentry.Native.targets --- scripts/build-sentry-native.ps1 | 22 ++++++++++------- .../Platforms/Native/Sentry.Native.targets | 24 +++++++++++++++---- .../buildTransitive/Sentry.Native.targets | 3 +-- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/scripts/build-sentry-native.ps1 b/scripts/build-sentry-native.ps1 index ee1d9a99ca..cc4f686798 100644 --- a/scripts/build-sentry-native.ps1 +++ b/scripts/build-sentry-native.ps1 @@ -84,17 +84,23 @@ try --config RelWithDebInfo ` --parallel - $srcFile = "$actualBuildDir/${libPrefix}sentry$libExtension" - $outFile = "$outDir/${libPrefix}sentry-native$libExtension" + function Deploy-Library($srcFile, $outFile) + { + # New-Item creates the directory if it doesn't exist. + New-Item -ItemType File -Path $outFile -Force | Out-Null - # New-Item creates the directory if it doesn't exist. - New-Item -ItemType File -Path $outFile -Force | Out-Null + Write-Host "Copying $srcFile to $outFile" + Copy-Item -Force -Path $srcFile -Destination $outFile - Write-Host "Copying $srcFile to $outFile" - Copy-Item -Force -Path $srcFile -Destination $outFile + # Touch the file to mark it as up-to-date for MSBuild + (Get-Item $outFile).LastWriteTime = Get-Date + } - # Touch the file to mark it as up-to-date for MSBuild - (Get-Item $outFile).LastWriteTime = Get-Date + Deploy-Library "$actualBuildDir/${libPrefix}sentry$libExtension" "$outDir/${libPrefix}sentry-native$libExtension" + if ($IsLinux) + { + Deploy-Library "$actualBuildDir/vendor/libunwind/${libPrefix}unwind$libExtension" "$outDir/${libPrefix}unwind$libExtension" + } } finally { diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets index d79ec6e414..7f588af17c 100644 --- a/src/Sentry/Platforms/Native/Sentry.Native.targets +++ b/src/Sentry/Platforms/Native/Sentry.Native.targets @@ -23,10 +23,10 @@ $(SentryNativeOutputDirectory)$(NativeLibRelativePath-osx)\ $(SentryNativeOutputDirectory-win-x64)lib$(SentryNativeLibraryName).lib $(SentryNativeOutputDirectory-win-arm64)lib$(SentryNativeLibraryName).lib - $(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a - $(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a - $(SentryNativeOutputDirectory-linux-arm64)lib$(SentryNativeLibraryName).a - $(SentryNativeOutputDirectory-linux-musl-arm64)lib$(SentryNativeLibraryName).a + $(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a + $(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a + $(SentryNativeOutputDirectory-linux-arm64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a + $(SentryNativeOutputDirectory-linux-musl-arm64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a $(SentryNativeOutputDirectory-osx)lib$(SentryNativeLibraryName).a @@ -56,6 +56,10 @@ true \sentry-native\$(NativeLibRelativePath-linux-x64) + + true + \sentry-native\$(NativeLibRelativePath-linux-x64) + @@ -63,6 +67,10 @@ true \sentry-native\$(NativeLibRelativePath-linux-musl-x64) + + true + \sentry-native\$(NativeLibRelativePath-linux-musl-x64) + @@ -70,6 +78,10 @@ true \sentry-native\$(NativeLibRelativePath-linux-arm64) + + true + \sentry-native\$(NativeLibRelativePath-linux-arm64) + @@ -77,6 +89,10 @@ true \sentry-native\$(NativeLibRelativePath-linux-musl-arm64) + + true + \sentry-native\$(NativeLibRelativePath-linux-musl-arm64) + diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets index 110d04252d..5844b8af38 100644 --- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets +++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets @@ -54,9 +54,8 @@ - - + From 4e28780265760e1a23448a50c619d2629c4d791e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 18 Feb 2026 07:36:29 +0100 Subject: [PATCH 9/9] sentry-native: switch back to fix/split_inproc_handler_thread --- modules/sentry-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sentry-native b/modules/sentry-native index 2a9585cdc3..8351ec22db 160000 --- a/modules/sentry-native +++ b/modules/sentry-native @@ -1 +1 @@ -Subproject commit 2a9585cdc35c4a50be06b3d168d8c4f5779325a6 +Subproject commit 8351ec22dbb6ea61b400d285072ad30b47f2723a