10000 Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 (#9049) · defold/defold@bd13041 · GitHub
[go: up one dir, main page]
Skip to content

Commit bd13041

Browse files
AGulevAGulev
committed
Updated to Xcode 15.4, iOS SDK 17.5 and macOS SDK 14.5 (#9049)
* 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
1 parent 3c044f8 commit bd13041

File tree

5 files changed

+31
-34
lines changed

5 files changed

+31
-34
lines changed

‎.github/workflows/editor-only.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
3232
},
3333
{ name: 'Fetch tags', run: 'git fetch --depth=1 origin +refs/tags/*:refs/tags/*' },
34-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
34+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
3535
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
3636
{ name: 'Install Leiningen', uses: DeLaGuardo/setup-clojure@bc7570e912b028bbcc22f457adec7fdf98e2f4ed, with: { lein: 2.8.3 } },
3737
{ name: 'Install dependencies', run: sudo apt-get install -y libgl1-mesa-dev libglw1-mesa-dev freeglut3-dev },
@@ -46,13 +46,13 @@ jobs:
4646

4747
sign-editor-macos:
4848
needs: [build-editor]
49-
runs-on: macOS-13
49+
runs-on: macOS-14
5050
strategy:
5151
matrix:
5252
platform: [x86_64-macos, arm64-macos]
5353
steps: [
5454
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
55-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
55+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
5656
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
5757
{
5858
name: 'Download editor',
@@ -83,7 +83,7 @@ jobs:
8383
platform: [x86_64-win32]
8484
steps: [
8585
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
86-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
86+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
8787
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
8888
{
8989
name: 'Download editor',
@@ -122,7 +122,7 @@ jobs:
122122
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
123123
},
124124
{ name: 'Fetch tags', run: 'git fetch --depth=1 origin +refs/tags/*:refs/tags/*' },
125-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
125+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
126126
{ name: 'Setup git user', run: 'git config --global user.email "services@defold.se" && git config --global user.name "Defold Services"' },
127127
{
128128
name: 'Install ext dependencies', # only needed for some python dependencies (should have a separate python setup function? 10000 )

‎.github/workflows/engine-nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ env:
1515

1616
jobs:
1717
bld-eng-macos-64:
18-
runs-on: macOS-13
18+
runs-on: macOS-14
1919
steps: [
2020
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
21-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
22-
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.1' } },
21+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
22+
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.4' } },
2323
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
2424
{ name: 'Install dependencies', run: 'ci/ci.sh install' },
2525
{
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-20.04
4747
steps: [
4848
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
49-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
49+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
5050
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
5151
{ name: 'Install dependencies', run: 'ci/ci.sh install' },
5252
{
@@ -80,7 +80,7 @@ jobs:
8080
runs-on: ubuntu-20.04
8181
steps: [
8282
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
83-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
83+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
8484
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
8585
{ name: 'Install dependencies', run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
8686
{
@@ -100,7 +100,7 @@ jobs:
100100
runs-on: windows-latest
101101
steps: [
102102
{ name: 'Checkout', uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 },
103-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
103+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
104104
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '11.0.15', distribution: 'microsoft'} },
105105
{ name: 'Install dependencies', run: 'ci/ci.sh install' },
106106
{

‎.github/workflows/main-ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: windows-latest
3636
steps: [
3737
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
38-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
38+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
3939
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
4040
{ name: 'Install dependencies', shell: bash, run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
4141
{
@@ -56,11 +56,11 @@ jobs:
5656
strategy:
5757
matrix:
5858
platform: [x86_64-macos, arm64-macos, arm64-ios, x86_64-ios]
59-
runs-on: macos-13
59+
runs-on: macos-14
6060
steps: [
6161
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
62-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
63-
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.1' } },
62+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
63+
{ name: 'XCode', uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd, with: { xcode-version: '15.4' } },
6464
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
6565
{
6666
name: 'Build engine',
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-20.04
8383
steps: [
8484
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
85-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
85+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
8686
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
8787
{ name: 'Install dependencies', run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
8888
{
@@ -105,7 +105,7 @@ jobs:
105105
runs-on: ubuntu-20.04
106106
steps: [
107107
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
108-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
108+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
109109
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
110110
{ name: 'Install dependencies', run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
111111
{
@@ -128,7 +128,7 @@ jobs:
128128
runs-on: ubuntu-20.04
129129
steps: [
130130
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
131-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
131+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
132132
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
133133
{ name: 'Install dependencies', run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
134134
{
@@ -151,7 +151,7 @@ jobs:
151151
runs-on: windows-latest
152152
steps: [
153153
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
154-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
154+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
155155
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
156156
{ name: 'Install dependencies', shell: bash, run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
157157
{
@@ -175,7 +175,7 @@ jobs:
175175
runs-on: windows-latest
176176
steps: [
177177
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
178-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
178+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
179179
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
180180
{ name: 'Install dependencies', shell: bash, run: 'ci/ci.sh install --platform=${{ matrix.platform }}' },
181181
{
@@ -199,7 +199,7 @@ jobs:
199199
runs-on: ubuntu-20.04
200200
steps: [
201201
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
202-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
202+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
203203
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
204204
{
205205
name: 'Build bob',
@@ -219,7 +219,7 @@ jobs:
219219
runs-on: ubuntu-20.04
220220
steps: [
221221
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
222-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
222+< 10000 div class="diff-text-inner"> { name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
223223
{
224224
name: 'Build SDK',
225225
if: (github.event_name != 'repository_dispatch') || ((github.event_name == 'repository_dispatch') && (github.event.client_payload.skip_sdk != true)),
@@ -247,7 +247,7 @@ jobs:
247247
fetch-tags: true
248248
}
249249
},
250-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
250+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
251251
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
252252
{ name: 'Install Leiningen', uses: DeLaGuardo/setup-clojure@bc7570e912b028bbcc22f457adec7fdf98e2f4ed, with: { lein: 2.8.3 } },
253253
{ name: 'Install dependencies', run: sudo apt-get install -y libgl1-mesa-dev libglw1-mesa-dev freeglut3-dev },
@@ -271,13 +271,13 @@ jobs:
271271

272272
sign-editor-darwin:
273273
needs: [build-editor]
274-
runs-on: macOS-13
274+
runs-on: macOS-14
275275
strategy:
276276
matrix:
277277
platform: [x86_64-macos, arm64-macos]
278278
steps: [
279279
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
280-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
280+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
281281
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
282282
{
283283
name: 'Download editor',
@@ -321,7 +321,7 @@ jobs:
321321
platform: [x86_64-win32]
322322
steps: [
323323
{ name: 'Checkout', uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11, with: { ref: '${{env.BUILD_BRANCH}}' } },
324-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
324+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
325325
{ name: 'Install Java', uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9, with: { java-version: '17.0.5+8', distribution: 'temurin'} },
326326
{
327327
name: 'Download editor',
@@ -375,7 +375,7 @@ jobs:
375375
fetch-tags: true
376376
}
377377
},
378-
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12, architecture: x64 } },
378+
{ name: 'Install Python', uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c, with: { python-version: 3.12.3} },
379379
{ name: 'Setup git user', run: 'git config --global user.email "services@defold.se" && git config --global user.name "Defold Services"' },
380380
{ name: 'Install dependencies', run: 'ci/ci.sh install --platform=${{ matrix.platform }} --steam-config-b64="${{env.STEAM_CONFIG_VDF}}"' },
381381
{

‎build_tools/sdk.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
# A list of minimum versions here: https://developer.apple.com/support/xcode/
4040

41-
VERSION_XCODE="15.1" # we also use this to match version on Github Actions
41+
VERSION_XCODE="15.4" # we also use this to match version on Github Actions
4242
VERSION_XCODE_CLANG="15.0.0"
43-
VERSION_MACOSX="14.2"
44-
VERSION_IPHONEOS="17.2"
45-
VERSION_IPHONESIMULATOR="17.2"
43+
VERSION_MACOSX="14.5"
44+
VERSION_IPHONEOS="17.5"
45+
VERSION_IPHONESIMULATOR="17.5"
4646
MACOS_ASAN_PATH="usr/lib/clang/%s/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
4747

4848
# NOTE: Minimum iOS-version is also specified in Info.plist-files

‎scripts/build.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,6 @@ def __del__(self):
328328
os._exit(5)
329329

330330
def get_python(self):
331-
if 'macos' in self.host and 'arm64' == platform.machine():
332-
if 'x86_64-macos' == self.target_platform:
333-
return ['arch', '-x86_64', 'python']
334331
return ['python']
335332

336333
def _create_common_dirs(self):

0 commit comments

Comments
 (0)
0