Skip to content

Commit 1345539

Browse files
committed
Restore CRATE_TYPES staticlib, clean up CI workflow
- Restore CRATE_TYPES staticlib in nod for embedded Apple (BUILD_SHARED_LIBS doesn't prevent Corrosion from building cdylib) - Remove BUILD_SHARED_LIBS=OFF from iOS/tvOS presets - Remove redundant "Acquire Dawn Deps" steps from all jobs - Add freetype to vcpkg packages on Windows
1 parent 75cfc5d commit 1345539

File tree

3 files changed

+3
-31
lines changed

3 files changed

+3
-31
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ jobs:
7373
# restore-keys: |
7474
# buildcache-${{runner.os}}-${{matrix.preset}}-
7575

76-
- name: Acquire Dawn Deps
77-
continue-on-error: true
78-
run: cmake --preset x-linux-ci-${{matrix.preset}}
79-
8076
- name: Configure CMake
8177
run: cmake --preset x-linux-ci-${{matrix.preset}}
8278

@@ -141,10 +137,6 @@ jobs:
141137
restore-keys: |
142138
buildcache-${{runner.os}}-universal-
143139
144-
- name: Acquire Dawn Deps
145-
continue-on-error: true
146-
run: cmake --preset x-macos-ci
147-
148140
- name: Configure CMake
149141
run: cmake --preset x-macos-ci
150142

@@ -197,10 +189,6 @@ jobs:
197189
- name: Verify CMake version
198190
run: cmake --version
199191

200-
- name: Acquire Dawn Deps
201-
continue-on-error: true
202-
run: cmake --preset ios-default
203-
204192
- name: Configure CMake
205193
run: cmake --preset ios-default
206194

@@ -240,10 +228,6 @@ jobs:
240228
- name: Verify CMake version
241229
run: cmake --version
242230

243-
- name: Acquire Dawn Deps
244-
continue-on-error: true
245-
run: cmake --preset tvos-default
246-
247231
- name: Configure CMake
248232
run: cmake --preset tvos-default
249233

@@ -301,14 +285,10 @@ jobs:
301285
run: echo "VCPKG_ROOT=C:\vcpkg" >> $env:GITHUB_ENV
302286

303287
- name: Install vcpkg packages
304-
run: vcpkg install zlib:x64-windows-static bzip2:x64-windows-static zstd:x64-windows-static liblzma:x64-windows-static
305-
306-
- name: Acquire Dawn Deps
307-
continue-on-error: true
308-
run: cmake --preset x-windows-ci-${{matrix.preset}}
288+
run: vcpkg install zlib:x64-windows-static bzip2:x64-windows-static zstd:x64-windows-static liblzma:x64-windows-static freetype:x64-windows-static
309289

310290
- name: Configure CMake
311-
run: cmake --preset x-windows-ci-${{matrix.preset}}
291+
run: cmake --preset x-windows-ci-${{matrix.preset}}
312292

313293
- name: Build
314294
run: cmake --build --preset x-windows-ci-${{matrix.preset}}

CMakePresets.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,6 @@
248248
"value": false
249249
},
250250
"Rust_CARGO_TARGET": "aarch64-apple-ios",
251-
"BUILD_SHARED_LIBS": {
252-
"type": "BOOL",
253-
"value": false
254-
},
255251
"IMGUI_USE_FREETYPE": {
256252
"type": "BOOL",
257253
"value": false
@@ -293,10 +289,6 @@
293289
},
294290
"Rust_CARGO_TARGET": "aarch64-apple-tvos",
295291
"Rust_TOOLCHAIN": "nightly",
296-
"BUILD_SHARED_LIBS": {
297-
"type": "BOOL",
298-
"value": false
299-
},
300292
"IMGUI_USE_FREETYPE": {
301293
"type": "BOOL",
302294
"value": false

extern/nod

Submodule nod updated 1 file

0 commit comments

Comments
 (0)