Skip to content

Commit b936117

Browse files
ci: Hopefully fix macOS build.
1 parent 964d80b commit b936117

11 files changed

Lines changed: 30 additions & 23 deletions

.github/workflows/build_android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ jobs:
4242
target: ${{ inputs.release && fromJSON('["template_release","template_debug"]') || fromJSON('["template_debug"]') }}
4343
steps:
4444
- name: Checkout Godot
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v6
4646
with:
4747
repository: godotengine/godot
4848
ref: ${{ inputs.version_ref }}
4949
submodules: recursive
5050

5151
- name: Checkout GodotJS
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
with:
5454
path: ${{github.workspace}}/modules/GodotJS/
5555
lfs: true
5656
submodules: recursive
5757

5858
- name: Set up Java 17
59-
uses: actions/setup-java@v4
59+
uses: actions/setup-java@v5
6060
with:
6161
distribution: temurin
6262
java-version: 17

.github/workflows/build_ios.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,23 @@ jobs:
4242
target: ${{ inputs.release && fromJSON('["template_release","template_debug"]') || fromJSON('["template_debug"]') }}
4343
steps:
4444
- name: Checkout Godot
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v6
4646
with:
4747
repository: godotengine/godot
4848
ref: ${{ inputs.version_ref }}
4949
submodules: recursive
5050

5151
- name: Checkout GodotJS
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
with:
5454
path: ${{github.workspace}}/modules/GodotJS/
5555
lfs: true
5656
submodules: recursive
5757

58+
# From https://github.com/actions/runner-images/blob/main/images/macos
59+
- name: Select Xcode 26
60+
run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
61+
5862
- name: Restore Godot build cache
5963
uses: ./.github/actions/godot-cache-restore
6064
continue-on-error: true

.github/workflows/build_linux.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
target: ${{ inputs.release && fromJSON('[ "editor","template_release","template_debug"]') || fromJSON('["editor"]') }}
4545
steps:
4646
- name: Checkout Godot
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
repository: godotengine/godot
5050
ref: ${{ inputs.version_ref }}
5151
submodules: recursive
5252

5353
- name: Checkout GodotJS
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v6
5555
with:
5656
path: ${{github.workspace}}/modules/GodotJS/
5757
lfs: true
@@ -137,6 +137,7 @@ jobs:
137137

138138
- name: Prepare artifact
139139
run: |
140+
rm -rf ./bin/build_deps
140141
strip bin/godot.*
141142
chmod +x bin/godot.*
142143

.github/workflows/build_macos.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,19 @@ jobs:
3838
engine: [v8, qjs-ng]
3939
target: ${{ inputs.release && fromJSON('["editor","template_release","template_debug"]') || fromJSON('["editor"]') }}
4040
steps:
41-
- name: Select Xcode 16
42-
run: sudo xcode-select -s /Applications/Xcode_16.2.app
41+
# From https://github.com/actions/runner-images/blob/main/images/macos
42+
- name: Select Xcode 26
43+
run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
4344

4445
- name: Checkout Godot
45-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4647
with:
4748
repository: godotengine/godot
4849
ref: ${{ inputs.version_ref }}
4950
submodules: recursive
5051

5152
- name: Checkout GodotJS
52-
uses: actions/checkout@v4
53+
uses: actions/checkout@v6
5354
with:
5455
path: ${{github.workspace}}/modules/GodotJS/
5556
lfs: true
@@ -155,6 +156,7 @@ jobs:
155156
run: |
156157
lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
157158
rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
159+
rm -rf ./bin/build_deps
158160
strip bin/godot.*
159161
chmod +x bin/godot.*
160162
@@ -182,7 +184,7 @@ jobs:
182184
engine: [v8, qjs-ng]
183185
steps:
184186
- name: Checkout Godot
185-
uses: actions/checkout@v4
187+
uses: actions/checkout@v6
186188
with:
187189
repository: godotengine/godot
188190
ref: ${{ inputs.version_ref }}

.github/workflows/build_web.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
shell: bash
4949

5050
- name: Checkout Godot
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v6
5252
with:
5353
repository: godotengine/godot
5454
ref: ${{ inputs.version_ref }}
5555
submodules: recursive
5656

5757
- name: Checkout GodotJS
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
5959
with:
6060
path: ${{github.workspace}}/modules/GodotJS/
6161
lfs: true

.github/workflows/build_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
target: ${{ inputs.release && fromJSON('["editor","template_release","template_debug"]') || fromJSON('["editor"]') }}
4747
steps:
4848
- name: Checkout Godot
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v6
5050
with:
5151
repository: godotengine/godot
5252
ref: ${{ inputs.version_ref }}
5353
submodules: recursive
5454

5555
- name: Checkout GodotJS
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5757
with:
5858
path: ${{github.workspace}}/modules/GodotJS/
5959
lfs: true

.github/workflows/misc_changesets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
publish: ${{ steps.should_publish.outputs.publish }}
1919
steps:
2020
- name: ⏬ Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222

2323
- name: 🛫 Setup pnpm
2424
uses: pnpm/action-setup@v4

.github/workflows/misc_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: ⏬ Checkout repository
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212

1313
- name: 🛠️ pnpm and build
1414
uses: ./.github/actions/pnpm-build

.github/workflows/misc_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: ${{ steps.publish_release.outputs.id }}
1717
steps:
1818
- name: ⏬ Checkout repo
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: 🛫 Setup pnpm
2222
uses: pnpm/action-setup@v4

.github/workflows/misc_upload_assets.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
engine: v8
2929
steps:
3030
- name: ⏬ Checkout repo
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232

3333
- name: Upload builds
3434
uses: ./.github/actions/upload-asset
@@ -51,7 +51,7 @@ jobs:
5151
target: [ template_release, template_debug ]
5252
steps:
5353
- name: ⏬ Checkout repo
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v6
5555

5656
- name: Upload builds
5757
uses: ./.github/actions/upload-asset
@@ -74,7 +74,7 @@ jobs:
7474
target: [ template_release, template_debug ]
7575
steps:
7676
- name: ⏬ Checkout repo
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@v6
7878

7979
- name: Upload builds
8080
uses: ./.github/actions/upload-asset

0 commit comments

Comments
 (0)