8000 Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 by AGulev · Pull Request #9049 · defold/defold · GitHub
[go: up one dir, main page]
Skip to content

Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 #9049

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

Jump to bottom
Merged
merged 5 commits into from
Jun 11, 2024
Merged

Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 #9049

merged 5 commits into from
Jun 11, 2024

Conversation

AGulev
Copy link
Contributor
@AGulev AGulev commented Jun 7, 2024

PR checklist

  • Code
    • Add engine and/or editor unit tests.
    • New and changed code follows the overall code style of existing code
    • Add comments where needed
  • Documentation
    • Make sure that API documentation is updated in code comments
    • Make sure that manuals are updated (in github.com/defold/doc)
  • Prepare pull request and affected issue for automatic release notes generator
    • Pull request - Write a message that explains what this pull request does. What was the problem? How was it solved? What are the changes to APIs or the new APIs introduced? This message will be used in the generated release notes. Make sure it is well written and understandable for a user of Defold.
    • Pull request - Write a pull request title that in a sentence summarises what the pull request does. Do not include "Issue-1234 ..." in the title. This text will be used in the generated release notes.
    • Pull request - Link the pull request to the issue(s) it is closing. Use on of the approved closing keywords.
    • Affected issue - Assign the issue to a project. Do not assign the pull request to a project if there is an issue which the pull request closes.
    • Affected issue - Assign the "breaking change" label to the issue if introducing a breaking change.
    • Affected issue - Assign the "skip release notes" is the issue should not be included in the generated release notes.

Example of a well written PR description:

  1. Start with the user facing changes. This will end up in the release notes.
  2. Add one of the GitHub approved closing keywords
  3. Optionally also add the technical changes made. This is information that might help the reviewer. It will not show up in the release notes. Technical changes are identified by a line starting with one of these:
    1. ### Technical changes
    2. Technical changes:
    3. Technical notes:
There was a anomaly in the carbon chroniton propeller, introduced in version 8.10.2. This fix will make sure to reset the phaser collector on application startup.

Fixes #1234

### Technical changes
* Pay special attention to line 23 of phaser_collector.clj as it contains some interesting optimizations
* The propeller code was not taking into account a negative phase.

@AGulev AGulev requested a review from JCash June 7, 2024 16:52
This was referenced Jun 7, 2024
Merged
Merged
ekharkunov
ekharkunov reviewed Jun 7, 2024
View reviewed changes
.github/workflows/engine-nightly.yml
@@ -19,7 +19,7 @@ jobs:
steps: [
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.1' } },
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.4' } },
Copy link
Contributor

Choose a reason for hiding this comment

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

Runner os version also should be updated because only macos-14 has Xcode 15.4 (https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#xcode)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thx!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Interesting if it's only arm64 runners now

Copy link
Contributor
@ekharkunov ekharkunov Jun 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Arm and non-arm runner exists.
Screenshot 2024-06-08 at 12 04 12

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could you share a link to the page where did you make this screenshot?

Copy link
Contributor

Choose a reason for hiding this comment

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

https://github.com/actions/runner-images/?tab=readme-ov-file#available-images

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you!

AGulev
AGulev commented Jun 10, 2024
View reviewed changes
.github/workflows/editor-only.yml
@@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
},
{ name: 'Fetch tags', run: 'git fetch --depth=1 origin +refs/tags/*:refs/tags/*' },
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I specified a minor version to workaround actions/setup-python#886

.github/workflows/editor-only.yml
@@ -46,13 +46,13 @@ jobs:

sign-editor-macos:
needs: [build-editor]
runs-on: macOS-13
runs-on: macOS-14
Copy link
Contributor Author

Choose a reason for hiding this comment

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

new runner needed to be able to use the latest xcode

.github/workflows/editor-only.yml
strategy:
matrix:
platform: [x86_64-macos, arm64-macos]
steps: [
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
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 have to specify arch anymore (each mac should pick an arch that fits better)

scripts/build.py
@@ -328,9 +328,6 @@ def __del__(self):
os._exit(5)

def get_python(self):
if 'macos' in self.host and 'arm64' == platform.machine():
if 'x86_64-macos' == self.target_platform:
return ['arch', '-x86_64', 'python']
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 need this logic anymore

@britzl britzl added task A task that needs to be performed pipeline Issue related to the asset build pipeline labels Jun 10, 2024
@AGulev AGulev merged commit 690be42 into dev Jun 11, 2024
@AGulev AGulev deleted the xcode-15.4 branch June 11, 2024 07:46
AGulev added a commit that referenced this pull request Jun 25, 2024
@AGulev
Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 (#9049)
bd13041 
* Update xcode to 15.4

* update runners

* remove `arch -x86_64` for python

* use python 3.12.3 as a workaround for actions/setup-python#886

* do not specify arch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekharkunov ekharkunov ekharkunov left review comments

@JCash JCash JCash approved these changes

Assignees
No one assigned
Labels
pipeline Issue related to the asset build pipeline task A task that needs to be performed
Projects
No open projects
1.9.0
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AGulev @ekharkunov @JCash @britzl
0