Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ indent_size = 2
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true

# Keep using directives at the top of the file, outside of the namespace
csharp_using_directive_placement = outside_namespace

# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false : warning
dotnet_style_qualification_for_property = false : warning
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/buildnative/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV
fi

- uses: actions/cache@v3
- uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
id: cache-c
with:
path: lib/sentrysupplemental/bin
Expand All @@ -35,7 +35,7 @@ runs:
shell: cmd
run: lib\sentrysupplemental\build.cmd

- uses: actions/cache@v3
- uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
id: cache-android
with:
path: lib/sentry-android-supplemental/bin
Expand Down
23 changes: 19 additions & 4 deletions .github/actions/environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ runs:
shell: bash
run: sudo chmod 666 /var/run/docker.sock

# Install old deprecated libssl1 for .NET 5.0 on Linux
- name: Install libssl1 for NET 5.0 on Linux
if: ${{ runner.os == 'Linux' }}
shell: bash
run: sudo ./scripts/install-libssl1.sh

- name: Install Linux ARM 32-bit dependencies
if: ${{ matrix.rid == 'linux-arm' }}
shell: bash
Expand All @@ -46,7 +52,7 @@ runs:
# Java 17 is needed for Android SDK setup step
- name: Install Java 17
if: ${{ !matrix.container }}
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
java-version: '17'
Expand All @@ -56,13 +62,13 @@ runs:
uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # v3.2.0
with:
# Exclude "tools" because the emulator is not needed (nor available for Windows/Linux ARM64)
packages: platform-tools platforms;android-34 platforms;android-35 build-tools;36.0.0
packages: platform-tools platforms;android-35 platforms;android-36 build-tools;36.0.0
log-accepted-android-sdk-licenses: false

# Java 11 is needed by .NET Android
- name: Install Java 11
if: ${{ !matrix.container }}
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
java-version: '11'
Expand All @@ -85,11 +91,20 @@ runs:
sudo chmod -R a+rw /usr/share/dotnet

- name: Install .NET SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
with:
global-json-file: global.json
dotnet-version: |
8.0.x
9.0.304
10.0.100-rc.1.25451.107

# .NET 5.0 does not support ARM64 on macOS
- name: Install .NET 5.0 SDK
if: ${{ runner.os != 'macOS' || runner.arch != 'ARM64' }}
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
with:
dotnet-version: 5.0.x

- name: Install .NET Workloads
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/freediskspace/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:

- name: Free Disk Space
if: runner.os == 'Linux'
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8 # v1.3.0
with:
android: false
dotnet: false
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
packages: write

steps:
- uses: actions/checkout@v5
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- uses: docker/login-action@v3
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

- uses: docker/build-push-action@v6
- uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
Loading