From 6fa7e9b236ec47b58df8b66a5a13c7ea4df3e033 Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 29 Apr 2025 09:39:50 -0400 Subject: [PATCH 1/3] try to build macos node release with vulkan --- .github/workflows/node-ci.yml | 1 + .github/workflows/node-release.yml | 1 + CMakePresets.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 33d05ff48433..98e0fdf09326 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -115,6 +115,7 @@ jobs: brew list pkg-config || brew install pkg-config brew list glfw || brew install glfw brew list libuv || brew install libuv + brew list molten-vk || brew install molten-vk - name: Install dependencies (Linux) if: runner.os == 'Linux' diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index 249475538e79..599c8486c5ac 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -85,6 +85,7 @@ jobs: brew list pkg-config || brew install pkg-config brew list glfw || brew install glfw brew list libuv || brew install libuv + brew list molten-vk || brew install molten-vk - name: Install dependencies (Linux) if: runner.os == 'Linux' diff --git a/CMakePresets.json b/CMakePresets.json index 2f40204adca1..17a29f9ded3f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -60,7 +60,7 @@ }, { "name": "macos-node", - "inherits": "macos", + "inherits": "macos-vulkan", "binaryDir": "${sourceDir}/build", "cacheVariables": { "MLN_WITH_NODE": "ON", From 9284cc9f25301274e372e9759a8fb053fcb0f00e Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 29 Apr 2025 10:39:28 -0400 Subject: [PATCH 2/3] try newer cmake --- .github/workflows/node-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 98e0fdf09326..9f3f9245be21 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -161,7 +161,7 @@ jobs: if: ${{contains(runner.name, 'GitHub Actions')}} uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.31' + cmake-version: '4.01' - name: cmake version run: | From ef1f95d637c584c456c3b06e385476b47908bca9 Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 29 Apr 2025 10:43:07 -0400 Subject: [PATCH 3/3] Revert "try newer cmake" This reverts commit 9284cc9f25301274e372e9759a8fb053fcb0f00e. --- .github/workflows/node-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 9f3f9245be21..98e0fdf09326 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -161,7 +161,7 @@ jobs: if: ${{contains(runner.name, 'GitHub Actions')}} uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '4.01' + cmake-version: '3.31' - name: cmake version run: |