Skip to content

chore: CI and Xcode 16 #3635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescrosswell merged 10 commits into from
Sep 30, 2024
Merged

chore: CI and Xcode 16 #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea57a7a
bump to xcode 16
bitsandfoxes Sep 27, 2024
239d10a
no to no-trimming
bitsandfoxes Sep 27, 2024
0f3e4ad
setting xcode manually
bitsandfoxes Sep 27, 2024
5446136
16 - not 16.0
bitsandfoxes Sep 27, 2024
f41b2ac
show me what you've got
bitsandfoxes Sep 27, 2024
648df29
.
bitsandfoxes Sep 27, 2024
3895090
..
bitsandfoxes Sep 27, 2024
4811c61
skip this mean test, pls
bitsandfoxes Sep 27, 2024
1a2204e
sounds good. doesn't work. does nothing, in fact.
bitsandfoxes Sep 27, 2024
ea5b2f3
Select XCode 16 for integration tests
jamescrosswell Sep 29, 2024
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
16 changes: 14 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "**.md"

env:
XCODE_VERSION: 15.4
XCODE_VERSION: 16

jobs:
build-sentry-native:
Expand Down Expand Up @@ -70,7 +70,13 @@ jobs:
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1

# We only use Xcode 15.4
- name: Setup Xcode
if: matrix.os == 'macos-latest'
run: |
sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
xcodebuild -version

# We only use Xcode 16
Copy link
Member

@bruno-garcia bruno-garcia Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the source of truth to the version we use is pinned above, are we better off changing this comment to: "This has to align with the xcode version we depend on, see ABC env var for details

Copy link
Collaborator

@jamescrosswell jamescrosswell Sep 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mean the # We only use Xcode 16 comment then we could change it to "Remove unused Xcode versions"... that step is basically just to free disk space.

- name: Remove unused applications
if: matrix.os == 'macos-latest'
run: |
Expand Down Expand Up @@ -197,6 +203,12 @@ jobs:
with:
dotnet-version: 8.0.x

- name: Setup Xcode
if: matrix.os == 'macos-latest'
run: |
sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
xcodebuild -version

# Needed for Android SDK setup step
- uses: actions/setup-java@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ async Task VerifyAsync(HttpRequestMessage message)
[SkippableFact]
private async Task Profiler_ThrowingOnSessionStartup_DoesntBreakSentryInit()
{
Skip.If(TestEnvironment.IsGitHubActions);

SampleProfilerSession.ThrowOnNextStartupForTests = true;

var tcs = new TaskCompletionSource<string>();
Expand Down