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
8 changes: 7 additions & 1 deletion .github/actions/environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ runs:
# Android SDK Tools are arm64-incompatible
# Android SDK Build Tools are musl-incompatible
- name: Set Environment Variables for Alpine Linux
if: ${{ (runner.os == 'Linux' && runner.arch == 'ARM64') || contains(matrix.container, 'alpine') }}
if: ${{ (runner.os == 'Linux' && runner.arch == 'ARM64') || contains(matrix.container.image, 'alpine') }}
shell: bash
run: echo "NO_MOBILE=true" >> $GITHUB_ENV

# Allow sudoless Docker in integration tests
- name: Prepare Docker on Alpine Linux
if: ${{ contains(matrix.container.image, 'alpine') }}
shell: bash
run: sudo chmod 666 /var/run/docker.sock

# 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
Expand Down
2 changes: 1 addition & 1 deletion .github/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apk update
RUN apk add bash build-base cmake curl git icu lsb-release-minimal sudo tar wget

# sentry-native
RUN apk add curl-dev libunwind-dev libunwind-static linux-headers openssl-dev zlib-dev xz-dev
RUN apk add curl-dev docker-cli libunwind-dev libunwind-static linux-headers openssl-dev zlib-dev xz-dev xz-static

# sentry-dotnet
RUN apk add grpc-plugins openjdk11 powershell
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Build Alpine Linux Docker image
on:
workflow_dispatch:
push:
branches:
- main
paths:
- '.github/alpine/*'

Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ on:

jobs:
build-sentry-native:
name: sentry-native (${{ matrix.container || matrix.os }})
name: sentry-native (${{ matrix.container.image || matrix.os }})
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
container: ${{ matrix.container.image }}
strategy:
fail-fast: false
matrix:
Expand All @@ -23,7 +23,8 @@ jobs:
target: Linux-arm64
- os: ubuntu-latest
target: Linux-musl
container: ghcr.io/getsentry/sentry-dotnet-alpine:3.21
container:
image: ghcr.io/getsentry/sentry-dotnet-alpine:3.21
- os: macos-15 # Pin macos to get the version of Xcode that we need: https://github.com/actions/runner-images/issues/10703
- os: windows-latest
- os: windows-11-arm
Expand Down Expand Up @@ -59,7 +60,7 @@ jobs:

build:
needs: build-sentry-native
name: .NET (${{ matrix.container || matrix.os }})
name: .NET (${{ matrix.container.image || matrix.os }})
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}

Expand All @@ -73,7 +74,10 @@ jobs:
target: Linux-arm64
- os: ubuntu-latest
target: Linux-musl
container: ghcr.io/getsentry/sentry-dotnet-alpine:3.21
container:
image: ghcr.io/getsentry/sentry-dotnet-alpine:3.21
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- os: macos-15 # Pin macos to get the version of Xcode that we need: https://github.com/actions/runner-images/issues/10703
- os: windows-latest
- os: windows-11-arm
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
### Fixes

- Crontab validation when capturing checkins ([#4314](https://github.com/getsentry/sentry-dotnet/pull/4314))
- Native AOT: link to static `lzma` on Linux/MUSL ([#4326](https://github.com/getsentry/sentry-dotnet/pull/4326))

### Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@

<ItemGroup Condition="'$(FrameworkSupportsNative)' == 'true' and '$(RuntimeIdentifier)' == 'linux-musl-x64'">
<DirectPInvoke Include="sentry-native" />
<!-- When musl is detected, static sentry-native links to static libunwind -->
<LinkerArg Include="-Wl,-Bstatic -Wl,--whole-archive -lunwind -Wl,--no-whole-archive -Wl,-Bdynamic" />
<NativeSystemLibrary Include="lzma" />
<!-- When musl is detected, static sentry-native links to static libunwind, which depends on liblzma -->
<LinkerArg Include="-Wl,-Bstatic -Wl,--whole-archive -lunwind -Wl,--no-whole-archive -llzma -Wl,-Bdynamic" />
<NativeLibrary Include="$(MSBuildThisFileDirectory)..\sentry-native\linux-musl-x64\libsentry-native.a" />
</ItemGroup>

Expand Down
Loading