Skip to content
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.

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

Fix integration tests in the CI #80

Merged
merged 6 commits into from
Oct 10, 2023
Merged

Conversation

albertvaka
Copy link
Contributor

@albertvaka albertvaka commented Oct 10, 2023

  • Build on macOS 13 [1] with Xcode 14.3 (latest to support targeting iOS 11, which we want to support)
  • Apply recommended project settings update for XCode 14.3
  • Fix a flaky test due to sorting of JSON dicts not being guaranteed

Passing pipeline: https://github.com/DataDog/dd-sdk-swift-testing/actions/runs/6469451790

[1] For some reason that I don't understand, even though we are targeting macos 10.13, I was getting compilation errors because of some macos 13-only code in the opentelemetry-swift dependency even when that code is behind an ifdef for macos 13+. Instead of trying to solve this, I went ahead and bumped the macos version we build on to 13, which also required bumping Xcode.

@albertvaka albertvaka requested a review from a team as a code owner October 10, 2023 07:52
@albertvaka albertvaka force-pushed the albertvaka/update-xcode-ci branch from 7f6c8e2 to c574c47 Compare October 10, 2023 08:18
.github/workflows/integrationTests.yml Outdated Show resolved Hide resolved
strategy:
fail-fast: false
matrix:
xcode: ["13.3.1", "14.0", "14.1", "14.2"]
xcode: ["Xcode_14.3"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe several Xcode version were selected here to test using several compiler versions. Are we ok dropping those?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Only Xcode 14.1 and later are available on the macOS 13 runners (which I had to upgrade to because of the new version of opentelemetry-swift), I can re-add 14.1 and 14.2 though if we want to make sure it continues to build there.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍🏼 14.2 and 14.3.1 might make sense since they use two different swift stack https://swiftversion.net/ no need for 14.1.

Copy link
Contributor Author

@albertvaka albertvaka Oct 10, 2023

Choose a reason for hiding this comment

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

Do you recommend having both 14.3 and 14.3.1 in addition ot 14.2? Or just 14.2 and 14.3.1 should be enough?

Copy link
Contributor

Choose a reason for hiding this comment

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

Just 14.2 and 14.3.1 should be enough. The later fixed a bug on 14.3 so having both isn't necessary.

@albertvaka albertvaka merged commit dd186f7 into main Oct 10, 2023
@albertvaka albertvaka deleted the albertvaka/update-xcode-ci branch October 10, 2023 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants