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

RDART-962: Use xcode 15.4 #1548

Merged
merged 9 commits into from
May 29, 2024
Merged

RDART-962: Use xcode 15.4 #1548

merged 9 commits into from
May 29, 2024

Conversation

nielsenko
Copy link
Contributor

@nielsenko nielsenko commented Mar 8, 2024

Fixes: #1547

Copy link

coveralls-official bot commented Mar 8, 2024

Pull Request Test Coverage Report for Build 9285323168

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 87.208%

Totals Coverage Status
Change from base Build 9267728256: 0.0%
Covered Lines: 5890
Relevant Lines: 6754

💛 - Coveralls

@nielsenko nielsenko force-pushed the kn/xcode-15 branch 3 times, most recently from 19be2b2 to 17827e8 Compare March 8, 2024 17:58
@nielsenko nielsenko changed the title RDART-962: Use xcode 15.2 RDART-962: Use xcode 15.3 Apr 8, 2024
@nielsenko nielsenko force-pushed the kn/xcode-15 branch 5 times, most recently from 0fe31e9 to 3d02b62 Compare April 8, 2024 17:11
@nielsenko nielsenko marked this pull request as ready for review April 8, 2024 17:16
@@ -3,18 +3,10 @@ name: Dart desktop tests
on:
workflow_call:
inputs:
os:
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I'm a huge fan of the changes in this file. I understand that it removes some redundant pieces of information, but it complicates the setup somewhat and forces readers to familiarize themselves with the architectures of the various github-hosted runners.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The previous code had assumptions about the architecture, that didn't actually match the runners, implicitly assuming arch was x86_64 unless architecture was set to arm. That is not correct for macos-14, which is being rolled out as macos-latest as of yesterday (github/roadmap#926).

One thing I regret is that I cannot show the arch in the job title, as we don't know what runner is being used yet, so it is only shown in the steps. And obviously I would have preferred for github action expressions to be expressive enough to lowercase a simple string 🙄

What if I reintroduce the architecture argument, and make a step that explicitly test that it actually match runner.arch?

Copy link
Member

Choose a reason for hiding this comment

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

Sure, I'd be fine with that.

submodules: 'recursive'
submodules: "recursive"

- name: Select XCode for MacOS
Copy link
Member

Choose a reason for hiding this comment

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

We need to increase the ulimit here it seems.

CHANGELOG.md Outdated Show resolved Hide resolved
@@ -7,4 +7,4 @@ set -o pipefail
cd "$(dirname "$0")/.."

cmake --preset macos
cmake --build --preset macos --config MinSizeRel -- -destination "generic/platform=macOS"
cmake --build --preset macos --config Release -- -destination "generic/platform=macOS"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

MinSizeRel becomes -Os which apparently clang++ (from XCode 15.x) don't like, hence this change.

@@ -168,7 +168,7 @@
"configurePreset": "macos",
"nativeToolOptions": [
"-destination",
"platform=macOS"
"generic/platform=macOS"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

As of XCode 15.3 it is apparently important to use generic/platform=macOS during preset, to actually end up with a universal binary (ie. supporting both arm64 and x86_64).

The downside of this change is that we also build for x86_64 on our dev machines, but given that we use ccache it is perhaps a non-issue in practice.

@nielsenko nielsenko force-pushed the kn/xcode-15 branch 8 times, most recently from 1da63ba to f69615f Compare April 12, 2024 08:27
@nielsenko nielsenko force-pushed the kn/xcode-15 branch 2 times, most recently from 375ceae to ab64653 Compare April 24, 2024 14:54
@nielsenko nielsenko force-pushed the kn/xcode-15 branch 3 times, most recently from 6fb86bd to 0247de5 Compare May 27, 2024 14:36
@nielsenko nielsenko requested a review from nirinchev May 28, 2024 08:26
@nielsenko nielsenko force-pushed the kn/xcode-15 branch 2 times, most recently from 3c999f4 to 49aa8af Compare May 28, 2024 08:32
@nielsenko nielsenko changed the title RDART-962: Use xcode 15.3 RDART-962: Use xcode 15.4 May 28, 2024
.github/workflows/build-native.yml Outdated Show resolved Hide resolved
- name: Select XCode for MacOS
if: startsWith(inputs.runner, 'macos')
run: |
xcodes installed
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't, but I find it useful to see what versions are available when looking at the output of the step

run: ulimit -n 10240
if: ${{ contains(inputs.os, 'macos') }}
run: |
ulimit -n
Copy link
Member

Choose a reason for hiding this comment

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

Why do we do this?

Copy link
Contributor Author

@nielsenko nielsenko May 29, 2024

Choose a reason for hiding this comment

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

To see the current limit in the output of the step before setting it.

.github/workflows/flutter-desktop-tests.yml Outdated Show resolved Hide resolved
nielsenko and others added 2 commits May 29, 2024 13:01
Co-authored-by: Nikola Irinchev <[email protected]>
@nielsenko nielsenko merged commit e2d9187 into main May 29, 2024
56 checks passed
@nielsenko nielsenko deleted the kn/xcode-15 branch May 29, 2024 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade CI to xcode 15 in prep for April app store requirements
2 participants