Skip to content

Commit bd53758

Browse files
authored
Merge branch 'main' into feat/add-profiling-integration
2 parents 24e6bde + 7bda98c commit bd53758

File tree

200 files changed

+4729
-3974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+4729
-3974
lines changed

.generated.NoMobile.sln

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ EndProject
6262
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.Serilog", "samples\Sentry.Samples.Serilog\Sentry.Samples.Serilog.csproj", "{AA98FD8D-1254-4B34-840C-06BB263933DE}"
6363
EndProject
6464
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{230B9384-90FD-4551-A5DE-1A5C197F25B6}"
65+
ProjectSection(SolutionItems) = preProject
66+
src\Directory.Build.props = src\Directory.Build.props
67+
src\Directory.Build.targets = src\Directory.Build.targets
68+
EndProjectSection
6569
EndProject
6670
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Android.AssemblyReader", "src\Sentry.Android.AssemblyReader\Sentry.Android.AssemblyReader.csproj", "{20386BBE-1F55-4503-9F5F-F2C6B29DE865}"
6771
EndProject
@@ -148,15 +152,16 @@ EndProject
148152
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleFileTestApp", "test\SingleFileTestApp\SingleFileTestApp.csproj", "{162A1CAE-ACEE-45CA-A6D0-7702ADE4D3DE}"
149153
EndProject
150154
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{A3CCA27E-4DF8-479D-833C-CAA0950715AA}"
155+
ProjectSection(SolutionItems) = preProject
156+
modules\sentry-cocoa.properties = modules\sentry-cocoa.properties
157+
EndProjectSection
151158
EndProject
152159
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TraceEvent", "modules\perfview\src\TraceEvent\TraceEvent.csproj", "{67269916-C417-4CEE-BD7D-CA66C3830AEE}"
153160
EndProject
154161
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastSerialization", "modules\perfview\src\FastSerialization\FastSerialization.csproj", "{8032310D-3C06-442C-A318-F365BCC4C804}"
155162
EndProject
156163
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.Console.Native", "samples\Sentry.Samples.Console.Native\Sentry.Samples.Console.Native.csproj", "{FC8AEABA-1A40-4891-9EBA-4B6A1F7244B2}"
157164
EndProject
158-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.Console.Metrics", "samples\Sentry.Samples.Console.Metrics\Sentry.Samples.Console.Metrics.csproj", "{BD2D08FC-8675-4157-A73C-D75F6A3856D3}"
159-
EndProject
160165
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.MacOS", "samples\Sentry.Samples.MacOS\Sentry.Samples.MacOS.csproj", "{5B100CC0-1A78-407E-A5A5-94BC06D67461}"
161166
EndProject
162167
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.Hangfire", "samples\Sentry.Samples.Hangfire\Sentry.Samples.Hangfire.csproj", "{407C477D-69C0-4B02-8A68-EE6B5A81C696}"
@@ -165,7 +170,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Hangfire", "src\Sent
165170
EndProject
166171
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Hangfire.Tests", "test\Sentry.Hangfire.Tests\Sentry.Hangfire.Tests.csproj", "{46E40BE8-1AB0-4846-B0A2-A40AD0272C64}"
167172
EndProject
168-
Project("{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.AspNetCore.WebAPI.Profiling", "samples\Sentry.Samples.AspNetCore.WebAPI.Profiling\Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj", "{A5B26C14-7313-4EDC-91E3-287F9374AB75}"
173+
Project("{00000000-0000-0000-0000-000000000000}") = "Sentry.Samples.AspNetCore.WebAPI.Profiling", "samples\Sentry.Samples.AspNetCore.WebAPI.Profiling\Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj", "{A5B26C14-7313-4EDC-91E3-287F9374AB75}"
169174
EndProject
170175
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{233D34AB-970E-4913-AA1E-172E833FB5B2}"
171176
ProjectSection(SolutionItems) = preProject
@@ -176,10 +181,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{233D34AB-9
176181
Directory.Build.targets = Directory.Build.targets
177182
global.json = global.json
178183
nuget.config = nuget.config
184+
.codecov.yml = .codecov.yml
185+
.gitignore = .gitignore
179186
EndProjectSection
180187
EndProject
181188
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.AspNetCore.Blazor.WebAssembly", "src\Sentry.AspNetCore.Blazor.WebAssembly\Sentry.AspNetCore.Blazor.WebAssembly.csproj", "{8298202C-9983-4D0A-851D-805539EE481A}"
182189
EndProject
190+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Analyzers", "src\Sentry.Analyzers\Sentry.Analyzers.csproj", "{E36C8DCA-464E-41CB-B189-F58553AAA8D4}"
191+
EndProject
192+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Analyzers.Tests", "test\Sentry.Analyzers.Tests\Sentry.Analyzers.Tests.csproj", "{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8}"
193+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.Console.HeapDump", "samples\Sentry.Samples.Console.HeapDump\Sentry.Samples.Console.HeapDump.csproj", "{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821}"
194+
EndProject
183195
Global
184196
GlobalSection(SolutionConfigurationPlatforms) = preSolution
185197
Debug|Any CPU = Debug|Any CPU
@@ -276,6 +288,7 @@ Global
276288
{4E0DC405-C372-4396-A5DF-F6AA108DA01C}.Release|Any CPU.Build.0 = Release|Any CPU
277289
{9B175EC8-6B64-4345-A158-091CB8876077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
278290
{9B175EC8-6B64-4345-A158-091CB8876077}.Debug|Any CPU.Build.0 = Debug|Any CPU
291+
{9B175EC8-6B64-4345-A158-091CB8876077}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
279292
{9B175EC8-6B64-4345-A158-091CB8876077}.Release|Any CPU.ActiveCfg = Release|Any CPU
280293
{9B175EC8-6B64-4345-A158-091CB8876077}.Release|Any CPU.Build.0 = Release|Any CPU
281294
{EE0DC846-52F3-46AF-BC0D-DEF81150CEC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -470,10 +483,6 @@ Global
470483
{FC8AEABA-1A40-4891-9EBA-4B6A1F7244B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
471484
{FC8AEABA-1A40-4891-9EBA-4B6A1F7244B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
472485
{FC8AEABA-1A40-4891-9EBA-4B6A1F7244B2}.Release|Any CPU.Build.0 = Release|Any CPU
473-
{BD2D08FC-8675-4157-A73C-D75F6A3856D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
474-
{BD2D08FC-8675-4157-A73C-D75F6A3856D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
475-
{BD2D08FC-8675-4157-A73C-D75F6A3856D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
476-
{BD2D08FC-8675-4157-A73C-D75F6A3856D3}.Release|Any CPU.Build.0 = Release|Any CPU
477486
{5B100CC0-1A78-407E-A5A5-94BC06D67461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
478487
{5B100CC0-1A78-407E-A5A5-94BC06D67461}.Debug|Any CPU.Build.0 = Debug|Any CPU
479488
{5B100CC0-1A78-407E-A5A5-94BC06D67461}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -498,6 +507,18 @@ Global
498507
{A5B26C14-7313-4EDC-91E3-287F9374AB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
499508
{A5B26C14-7313-4EDC-91E3-287F9374AB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
500509
{A5B26C14-7313-4EDC-91E3-287F9374AB75}.Release|Any CPU.Build.0 = Release|Any CPU
510+
{E36C8DCA-464E-41CB-B189-F58553AAA8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
511+
{E36C8DCA-464E-41CB-B189-F58553AAA8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
512+
{E36C8DCA-464E-41CB-B189-F58553AAA8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
513+
{E36C8DCA-464E-41CB-B189-F58553AAA8D4}.Release|Any CPU.Build.0 = Release|Any CPU
514+
{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
515+
{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
516+
{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
517+
{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8}.Release|Any CPU.Build.0 = Release|Any CPU
518+
{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
519+
{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821}.Debug|Any CPU.Build.0 = Debug|Any CPU
520+
{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821}.Release|Any CPU.ActiveCfg = Release|Any CPU
521+
{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821}.Release|Any CPU.Build.0 = Release|Any CPU
501522
EndGlobalSection
502523
GlobalSection(SolutionProperties) = preSolution
503524
HideSolutionNode = FALSE
@@ -574,12 +595,14 @@ Global
574595
{67269916-C417-4CEE-BD7D-CA66C3830AEE} = {A3CCA27E-4DF8-479D-833C-CAA0950715AA}
575596
{8032310D-3C06-442C-A318-F365BCC4C804} = {A3CCA27E-4DF8-479D-833C-CAA0950715AA}
576597
{FC8AEABA-1A40-4891-9EBA-4B6A1F7244B2} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
577-
{BD2D08FC-8675-4157-A73C-D75F6A3856D3} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
578598
{5B100CC0-1A78-407E-A5A5-94BC06D67461} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
579599
{407C477D-69C0-4B02-8A68-EE6B5A81C696} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
580600
{EADF25F5-8D02-4747-AB54-5F2BAA648471} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
581601
{46E40BE8-1AB0-4846-B0A2-A40AD0272C64} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
582602
{8298202C-9983-4D0A-851D-805539EE481A} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
583603
{A5B26C14-7313-4EDC-91E3-287F9374AB75} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
604+
{E36C8DCA-464E-41CB-B189-F58553AAA8D4} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
605+
{5A17FEF9-07BB-47B8-9883-9C2CC93F09E8} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
606+
{D7DF0B26-AD43-4F8B-9BFE-C4471CCC9821} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
584607
EndGlobalSection
585608
EndGlobal

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @bitsandfoxes @jamescrosswell
1+
* @bruno-garcia @jamescrosswell

.github/actions/environment/action.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,56 @@ runs:
2222
with:
2323
log-accepted-android-sdk-licenses: false
2424

25+
# https://github.com/actions/runner-images/issues/10814
26+
- name: Workaround build-tools issue
27+
if: runner.os == 'macOS'
28+
shell: bash
29+
run: |
30+
curl https://dl.google.com/android/repository/build-tools_r35_macosx.zip > $ANDROID_HOME/build-tools_r35_macosx.zip
31+
cd $ANDROID_HOME
32+
mkdir -p build-tools
33+
unzip build-tools_r35_macosx.zip
34+
mv android-15 build-tools/35.0.0
35+
cd -
36+
2537
- name: Set Java Version
2638
uses: actions/setup-java@v3
2739
with:
2840
distribution: 'temurin'
2941
java-version: '11'
3042

31-
# .NET 6 and .NET 8 are not built-in with macos-13
43+
- name: Install Mono
44+
if: runner.os == 'macOS'
45+
shell: bash
46+
# Attempt to install Mono, allowing it to fail silently
47+
# Then ensure mono is correctly linked, overwriting any conflicting symlinks
48+
run: |
49+
brew install mono || true
50+
brew link --overwrite mono
51+
3252
- name: Install .NET SDK
33-
uses: actions/setup-dotnet@v3
53+
if: runner.os != 'Windows'
54+
uses: actions/setup-dotnet@v4
3455
with:
3556
dotnet-version: |
3657
6.0.x
3758
7.0.x
3859
8.0.x
60+
9.0.100
61+
62+
- name: Install .NET 9
63+
if: runner.os == 'Windows'
64+
uses: actions/setup-dotnet@v4
65+
with:
66+
dotnet-version: |
67+
9.0.100
3968
4069
- name: Install .NET Workloads
4170
shell: bash
4271
run: >
4372
dotnet workload install \
44-
wasm-tools maui-android \
73+
wasm-tools wasm-tools-net8 maui-android \
4574
${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows macos' || '' }} \
46-
${{ runner.os == 'Windows' && 'maui-windows' || '' }} \
75+
${{ runner.os == 'Windows' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \
4776
--temp-dir "${{ runner.temp }}" \
4877
--skip-sign-check
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Remove unused applications
2+
description: Frees disk space by removing unused applications
3+
runs:
4+
using: composite
5+
steps:
6+
7+
- name: Free Disk Space
8+
if: runner.os == 'Linux'
9+
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
10+
with:
11+
android: false
12+
dotnet: false
13+
haskell: true
14+
large-packages: false
15+
docker-images: true
16+
swap-storage: true
17+
18+
# TODO: Do we need all of these or just one?
19+
# 514M /usr/lib/llvm-15
20+
# 486M /usr/lib/llvm-14
21+
# 448M /usr/lib/llvm-13
22+
- name: Remove unused applications
23+
if: runner.os == 'Linux'
24+
shell: bash
25+
run: |
26+
df -h /dev/root
27+
sudo rm -rf /usr/local/.ghcup
28+
sudo rm -rf /usr/local/julia1.10.5
29+
sudo rm -rf /usr/lib/heroku
30+
sudo rm -rf /opt/hostedtoolcache/go
31+
sudo rm -rf /opt/hostedtoolcache/Ruby
32+
sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
33+
sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
34+
sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
35+
df -h /dev/root

.github/workflows/build.yml

Lines changed: 24 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ on:
99
paths-ignore:
1010
- "**.md"
1111

12-
env:
13-
XCODE_VERSION: 16
14-
1512
jobs:
1613
build-sentry-native:
1714
name: sentry-native (${{ matrix.os }})
18-
runs-on: ${{ matrix.os }}-latest
15+
runs-on: ${{ matrix.os }}
1916
strategy:
2017
fail-fast: false
2118
matrix:
22-
os: [ubuntu, windows, macos]
19+
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
20+
os: [ubuntu-latest, windows-latest, macos-15]
2321

2422
steps:
2523
- name: Checkout
@@ -34,16 +32,8 @@ jobs:
3432
key: sentry-native-${{ runner.os }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
3533
enableCrossOsArchive: true
3634

37-
- name: Free Disk Space (Ubuntu)
38-
if: matrix.os == 'ubuntu-latest'
39-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
40-
with:
41-
android: true
42-
dotnet: false
43-
haskell: true
44-
large-packages: false
45-
docker-images: false
46-
swap-storage: true
35+
- name: Remove unused applications
36+
uses: ./.github/actions/freediskspace
4737

4838
- name: Install build dependencies
4939
if: steps.cache.outputs.cache-hit != 'true' && runner.os == 'Linux'
@@ -63,40 +53,26 @@ jobs:
6353
strategy:
6454
fail-fast: false
6555
matrix:
66-
os: [ubuntu-latest, windows-latest, macos-latest]
56+
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
57+
os: [ubuntu-latest, windows-latest, macos-15]
6758

6859
steps:
6960
- name: Cancel Previous Runs
7061
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
7162
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
7263

73-
- name: Setup Xcode
74-
if: matrix.os == 'macos-latest'
75-
run: |
76-
sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
77-
xcodebuild -version
78-
79-
# We only use Xcode 16
80-
- name: Remove unused applications
81-
if: matrix.os == 'macos-latest'
82-
run: |
83-
df -hI /dev/disk3s1s1
84-
sudo rm -rf /Applications/Xcode_14.3.1.app
85-
sudo rm -rf /Applications/Xcode_15.0.1.app
86-
sudo rm -rf /Applications/Xcode_15.1.app
87-
sudo rm -rf /Applications/Xcode_15.2.app
88-
sudo rm -rf /Applications/Xcode_15.3.app
89-
df -hI /dev/disk3s1s1
90-
9164
- name: Checkout
9265
uses: actions/checkout@v4
9366
with:
9467
submodules: recursive
9568
fetch-depth: 2 # default is 1 and codecov needs > 1
9669

97-
# We use macOS for the final publishing build so we we get all the iOS/macCatalyst targets in the packages
70+
- name: Remove unused applications
71+
uses: ./.github/actions/freediskspace
72+
73+
# We use macOS for the final publishing build so we get all the iOS/macCatalyst targets in the packages
9874
- name: Set Environment Variables
99-
if: startsWith(matrix.os, 'macos')
75+
if: runner.os == 'macOS'
10076
run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
10177

10278
- name: Download sentry-native (Linux)
@@ -133,14 +109,19 @@ jobs:
133109
- name: Restore .NET Dependencies
134110
run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
135111

112+
- name: Install Android SDKs
113+
if: runner.os == 'macOS'
114+
run: |
115+
dotnet build src/Sentry/Sentry.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
116+
136117
- name: Build
137118
run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -v:minimal -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true
138119

139120
- name: Test
140121
run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
141122

142123
- name: Upload code coverage
143-
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
124+
uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a
144125

145126
- name: Upload build and test outputs
146127
if: failure()
@@ -173,7 +154,8 @@ jobs:
173154
strategy:
174155
fail-fast: false
175156
matrix:
176-
os: [ubuntu-latest, windows-latest, macos-latest]
157+
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
158+
os: [ubuntu-latest, windows-latest, macos-15]
177159

178160
steps:
179161
- uses: actions/checkout@v4
@@ -183,6 +165,8 @@ jobs:
183165
sparse-checkout: |
184166
Directory.Build.props
185167
integration-test
168+
.github
169+
186170
- name: Fetch Nuget Packages
187171
uses: actions/download-artifact@v4
188172
with:
@@ -195,26 +179,8 @@ jobs:
195179
sudo apt update
196180
sudo apt install libcurl4-openssl-dev
197181
198-
- uses: actions/setup-dotnet@v4
199-
with:
200-
dotnet-version: 8.0.x
201-
202-
- name: Setup Xcode
203-
if: matrix.os == 'macos-latest'
204-
run: |
205-
sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
206-
xcodebuild -version
207-
208-
# Needed for Android SDK setup step
209-
- uses: actions/setup-java@v4
210-
with:
211-
distribution: 'temurin'
212-
java-version: '17'
213-
214-
- name: Setup Android SDK
215-
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
216-
217-
- run: dotnet workload install android maui-android
182+
- name: Setup Environment
183+
uses: ./.github/actions/environment
218184

219185
- name: Test
220186
uses: getsentry/github-workflows/sentry-cli/integration-test/@v2

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,20 @@ jobs:
3535
uses: ./.github/actions/environment
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
38+
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # pin@v2
3939
with:
4040
languages: csharp
4141

4242
- name: Restore .NET Dependencies
43-
run: dotnet restore Sentry-CI-CodeQL.slnf --nologo
43+
# We should be able to get rid of the restore here, if we install the correct workloads in actions/environment
44+
run: |
45+
dotnet workload restore
46+
dotnet restore Sentry-CI-CodeQL.slnf --nologo
4447
4548
- name: Build
4649
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
4750

4851
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
52+
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # pin@v2
5053
with:
5154
category: '/language:csharp'

0 commit comments

Comments
 (0)