summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby Sudekum <bobby@mapbox.com>2017-09-29 10:35:37 -0700
committerGitHub <noreply@github.com>2017-09-29 10:35:37 -0700
commitb296f54769cb7487013bab14ae281c082c3aac21 (patch)
treeaabe2515b5b53d8906e6b9a16727fe0607af2d29
parent201b7d4811a5370ea18518040aeca07fbb7e7b72 (diff)
downloadqtlocation-mapboxgl-b296f54769cb7487013bab14ae281c082c3aac21.tar.gz
Release node v3.5.6 (#9610)node-v3.5.6
-rw-r--r--circle.yml24
-rw-r--r--package.json2
-rw-r--r--platform/node/CHANGELOG.md13
-rwxr-xr-xplatform/node/scripts/after_success.sh4
4 files changed, 27 insertions, 16 deletions
diff --git a/circle.yml b/circle.yml
index 6ff8a84f87..d80fd6efb1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,9 +10,18 @@ workflows:
ignore: master
- android-debug-arm-v7
- android-release-all
- - node4-clang39-release
- - node6-clang39-release
- - node6-clang39-debug
+ - node4-clang39-release:
+ filters:
+ tags:
+ only: /node-.*/
+ - node6-clang39-release:
+ filters:
+ tags:
+ only: /node-.*/
+ - node6-clang39-debug:
+ filters:
+ tags:
+ only: /node-.*/
- linux-clang39-debug
- linux-clang4-sanitize-address
- linux-clang4-sanitize-undefined
@@ -298,8 +307,7 @@ jobs:
JOBS: 4
BUILDTYPE: RelWithDebInfo
WITH_EGL: 1
- PACKAGE_JSON_VERSION: $(node -e "console.log(require('./package.json').version)")
- PUBLISH: $([[ "${CIRCLE_BRANCH}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
+ WITH_CXX11ABI: 0
steps:
- checkout
- *generate-cache-key
@@ -322,8 +330,7 @@ jobs:
JOBS: 4
BUILDTYPE: RelWithDebInfo
WITH_EGL: 1
- PACKAGE_JSON_VERSION: $(node -e "console.log(require('./package.json').version)")
- PUBLISH: $([[ "${CIRCLE_BRANCH}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
+ WITH_CXX11ABI: 0
steps:
- checkout
- *generate-cache-key
@@ -346,8 +353,7 @@ jobs:
JOBS: 4
BUILDTYPE: Debug
WITH_EGL: 1
- PACKAGE_JSON_VERSION: $(node -e "console.log(require('./package.json').version)")
- PUBLISH: $([[ "${CIRCLE_BRANCH}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
+ WITH_CXX11ABI: 0
steps:
- checkout
- *generate-cache-key
diff --git a/package.json b/package.json
index be1e8663f4..fb62bc63ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@mapbox/mapbox-gl-native",
- "version": "3.5.5",
+ "version": "3.5.6",
"description": "Renders map tiles with Mapbox GL",
"keywords": [
"mapbox",
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
index e75b1687f1..1d166a9a79 100644
--- a/platform/node/CHANGELOG.md
+++ b/platform/node/CHANGELOG.md
@@ -1,5 +1,8 @@
-# master
-* Increased the default maximum zoom level from 20 to 22 ([#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835))
+# 3.5.6 - September 29, 2017
+- Protects against requests which throw [#9554](https://github.com/mapbox/mapbox-gl-native/pull/9554)
+- Fixed an issue around reusing a map object [#9554](https://github.com/mapbox/mapbox-gl-native/pull/9554)
+- Fixed an issue in test [#9553](https://github.com/mapbox/mapbox-gl-native/pull/9553)
+- Increased the default maximum zoom level from 20 to 22 ([#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835))
# 3.5.5 - July 14, 2017
- Provide debuggable release builds for node packages [#9497](https://github.com/mapbox/mapbox-gl-native/pull/9497)
@@ -182,7 +185,7 @@
- Check libuv version semver-ishly, fixes segfaults in Node.js 0.12.x
and io.js.
-- Fixes segfault, throws JavaScript error instead when attempting to
+- Fixes segfault, throws JavaScript error instead when attempting to
render without first loading a style.
- Bumps mbgl submodule to v0.4.0
@@ -208,12 +211,12 @@
# 1.0.3 - April 3, 2015
-- Fixes crash during garbage collection by assigning FileSource handle
+- Fixes crash during garbage collection by assigning FileSource handle
to a v8::Persistent in NodeMap constructor.
# 1.0.2 - April 2, 2015
-- Initialize shared display connection at module load time to avoid
+- Initialize shared display connection at module load time to avoid
race condition when display connection is initialized on-demand.
# 1.0.1 - March 19, 2015
diff --git a/platform/node/scripts/after_success.sh b/platform/node/scripts/after_success.sh
index 18e00a4f0d..a5c3c5ec36 100755
--- a/platform/node/scripts/after_success.sh
+++ b/platform/node/scripts/after_success.sh
@@ -3,7 +3,9 @@
set -e
set -o pipefail
-if [[ "${PUBLISH:-}" == true ]]; then
+PACKAGE_JSON_VERSION=`node -e "console.log(require('./package.json').version)"`
+
+if [[ "${CIRCLE_TAG}" == "node-v${PACKAGE_JSON_VERSION}" ]] || [[ "${PUBLISH:-}" == true ]]; then
if [[ "${BUILDTYPE}" == "RelWithDebInfo" ]]; then
./node_modules/.bin/node-pre-gyp package publish info
elif [[ "${BUILDTYPE}" == "Debug" ]]; then