From 6a6634370f59e92b621913fe5714ac1980de28cc Mon Sep 17 00:00:00 2001 From: Andrew Calcutt Date: Mon, 13 Oct 2025 23:28:11 -0400 Subject: [PATCH] [node] use macos-15 and macos-15-intel for workflow macos runners. Add new node pre-release. (#3863) --- .github/actionlint.yaml | 1 + .github/workflows/node-ci.yml | 4 ++-- .github/workflows/node-release.yml | 4 ++-- platform/node/CHANGELOG.md | 14 ++++++++------ platform/node/package-lock.json | 6 +++--- platform/node/package.json | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 5f99dbfd2..a7cf7558f 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -2,6 +2,7 @@ self-hosted-runner: # Labels of self-hosted runner in array of strings. labels: - windows-11-arm # can be removed once actionlint is updated + - macos-15-intel # can be removed once actionlint is updated - MapLibre_Native_Ubuntu_22_04_ARM_8_core - MapLibre_Native_Ubuntu_24_04_x84_16_core # Configuration variables in array of strings defined in your repository or diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 4de3103ed..da4d6952e 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -78,9 +78,9 @@ jobs: arch: x86_64 - runs-on: ubuntu-24.04-arm arch: arm64 - - runs-on: macos-13 + - runs-on: macos-15-intel arch: x86_64 - - runs-on: macos-14 + - runs-on: macos-15 arch: arm64 - runs-on: windows-2022 arch: x86_64 diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index 0f5a4087e..5832dbf81 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -48,9 +48,9 @@ jobs: arch: x86_64 - runs-on: ubuntu-24.04-arm arch: arm64 - - runs-on: macos-13 + - runs-on: macos-15-intel arch: x86_64 - - runs-on: macos-14 + - runs-on: macos-15 arch: arm64 - runs-on: windows-2022 arch: x86_64 diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index 3739a4a9f..7f4ef3f34 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -1,11 +1,13 @@ ## main -## 6.3.0-pre.0 -* Updated supported node versions to v20, v22, and v24. Support for node v18 has been removed. -* Updated the linux binary to be built on Ubuntu 24.04 -* Updated NAN to v2.23.0 to support node v24 -* Moved node-pre-gyp back to @acalcutt/node-pre-gyp to support node v24. There is currently an issue with releases of @mapbox/node-pre-gyp which is preventing using it. -* Add Windows arm64 binary build to ci and release workflows. +## 6.3.0-pre.1 +* Updated supported node versions to v20, v22, and v24. Support for node v18 has been removed. ([#3760](https://github.com/maplibre/maplibre-native/pull/3760)) +* Updated NAN to v2.23.0 to support node v24 ([#3760](https://github.com/maplibre/maplibre-native/pull/3760)) +* Updated the linux binary to be built on Ubuntu 24.04 ([#3760](https://github.com/maplibre/maplibre-native/pull/3760)) +* Updated the macos binary to be built on macOS 15 ([#3863](https://github.com/maplibre/maplibre-native/pull/3863)) +* Moved node-pre-gyp back to @acalcutt/node-pre-gyp to support node v24. There is currently an issue with releases of @mapbox/node-pre-gyp which is preventing using it. ([#3760](https://github.com/maplibre/maplibre-native/pull/3760)) +* Add Windows arm64 binary build to ci and release workflows. ([#3760](https://github.com/maplibre/maplibre-native/pull/3760)) +* Add options parameter to addImage method in Node.js type definitions ([#3868](https://github.com/maplibre/maplibre-native/pull/3868)) ## 6.2.0 * Fix freezing in macos/metal after ~32 renders ([Issue](https://github.com/maplibre/maplibre-native/issues/2928), [PR](https://github.com/maplibre/maplibre-native/pull/3673)). diff --git a/platform/node/package-lock.json b/platform/node/package-lock.json index d5a7a645f..79ad39806 100644 --- a/platform/node/package-lock.json +++ b/platform/node/package-lock.json @@ -1,12 +1,12 @@ { "name": "@maplibre/maplibre-gl-native", - "version": "6.3.0-pre.0", + "version": "6.3.0-pre.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@maplibre/maplibre-gl-native", - "version": "6.3.0-pre.0", + "version": "6.3.0-pre.1", "hasInstallScript": true, "license": "BSD-2-Clause", "dependencies": { @@ -44,7 +44,7 @@ "xcode": "^3.0.1" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/@acalcutt/node-pre-gyp": { diff --git a/platform/node/package.json b/platform/node/package.json index f73aa5b00..95bbb9894 100644 --- a/platform/node/package.json +++ b/platform/node/package.json @@ -1,6 +1,6 @@ { "name": "@maplibre/maplibre-gl-native", - "version": "6.3.0-pre.0", + "version": "6.3.0-pre.1", "description": "Renders map tiles with MapLibre Native", "keywords": [ "maplibre",