Skip to content

Upgrade to Electron 43 #22

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

Merged
sandboxcoder merged 3 commits into from
Aug 27, 2026
Merged

Upgrade to Electron 43 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e2dd76
Upgrade to Electron 43
sandboxcoder Aug 25, 2026
acd1d0b
use CMake setting for osx deployment target
sandboxcoder Aug 25, 2026
ef589b4
set CMAKE_OSX_DEPLOYMENT_TARGET before initial toolchain initialization
sandboxcoder Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
FULL_DISTRIBUTE_PATH: build/distribute
RUNTIME_URL: https://artifacts.electronjs.org/headers/dist
RUNTIME_NAME: iojs
RUNTIME_VERSION: v29.4.3
RUNTIME_VERSION: v43.2.0

permissions:
contents: read
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '24.x'

- name: Install dependencies
run: yarn install
Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
cmake_minimum_required(VERSION 3.5)
project(node_window_rendering)

if(APPLE)
if (NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
endif()
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
if ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
set(CMAKE_OSX_DEPOLYMENT_TARGET "11.0")
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
endif()
endif()
endif()

project(node_window_rendering)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

#############################
Expand All @@ -22,7 +23,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

SET(NODEJS_URL "https://artifacts.electronjs.org/headers/dist" CACHE STRING "Node.JS URL")
SET(NODEJS_NAME "iojs" CACHE STRING "Node.JS Name")
SET(NODEJS_VERSION "v29.4.3" CACHE STRING "Node.JS Version")
SET(NODEJS_VERSION "v43.2.0" CACHE STRING "Node.JS Version")

include(NodeJS)
include(CPack)
Expand Down
1 change: 0 additions & 1 deletion ci/build-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ fi

# Configure
cmake .. \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${FULL_DISTRIBUTE_PATH}/node-window-rendering \
Comment on lines 34 to 37

@sandboxcoder sandboxcoder Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@copilot can you re-evaluate this branch? I addressed this defect

Copilot AI Aug 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Re-reviewed this branch: acd1d0b removes the empty -DCMAKE_OSX_DEPLOYMENT_TARGET= override from ci/build-osx.sh, so CMake now falls back to the architecture-based defaults in CMakeLists.txt (10.15 for x86_64, 11.0 for arm64). No further change is needed here.

${NODEJS_NAME_PARAM} \
Expand Down
Loading