summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-06-15 16:18:33 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-06-15 16:18:33 -0700
commitbf28fd6c7a39da31c18131919f523585b2eb0b20 (patch)
treec80c94715efd66390068dec4e422c5b04a6877c4
parentf288a54c83ffb78c11462e2a759f5db6aef4cc37 (diff)
downloadqtlocation-mapboxgl-upstream/drop-node-4.tar.gz
[node] Build all node ABIsupstream/drop-node-4
Note that we're still only testing the v6 ABI (48).
-rw-r--r--circle.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/circle.yml b/circle.yml
index ae7c070d6f..bddac27255 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,11 +24,11 @@ workflows:
only: /android-v.*/
branches:
ignore: /.*/
- - node6-clang39-release:
+ - node-clang39-release:
filters:
tags:
only: /node-.*/
- - node6-gcc6-debug:
+ - node-gcc6-debug:
filters:
tags:
only: /node-.*/
@@ -52,7 +52,7 @@ workflows:
ignore: /.*/
- macos-debug
- macos-debug-qt5
- - macos-release-node6:
+ - macos-release-node:
filters:
tags:
only: /node-.*/
@@ -111,7 +111,7 @@ step-library:
- &build-node
run:
name: Build node
- command: make node
+ command: make node-all
- &build-linux
run:
name: Build linux
@@ -158,9 +158,9 @@ step-library:
command: |
brew install cmake ccache
- - &install-macos-node6-dependencies
+ - &install-macos-node-dependencies
run:
- name: Install macOS Node@6 dependencies
+ name: Install macOS Node dependencies
command: |
brew install node@6
brew link node@6 --force --overwrite
@@ -516,7 +516,7 @@ jobs:
# ------------------------------------------------------------------------------
- node6-clang39-release:
+ node-clang39-release:
docker:
- image: mbgl/7d2403f42e:linux-clang-3.9
working_directory: /src
@@ -539,7 +539,7 @@ jobs:
- *upload-render-tests
# ------------------------------------------------------------------------------
- node6-gcc6-debug:
+ node-gcc6-debug:
docker:
- image: mbgl/7d2403f42e:linux-gcc-6
resource_class: large
@@ -956,7 +956,7 @@ jobs:
destination: test/fixtures
# ------------------------------------------------------------------------------
- macos-release-node6:
+ macos-release-node:
macos:
xcode: "9.4.0"
environment:
@@ -965,7 +965,7 @@ jobs:
steps:
- checkout
- *install-macos-dependencies
- - *install-macos-node6-dependencies
+ - *install-macos-node-dependencies
- *generate-cache-key
- *restore-cache
- *reset-ccache-stats