summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-07-02 18:43:33 -0400
committerJason Wray <friedbunny@users.noreply.github.com>2018-07-09 15:22:59 -0400
commitba4b8464dd09acd93ff2fa6931ff15fdf6def244 (patch)
treedb1d8caa64a1047f9c7fe2dd406cd21a55f5c9f8
parentd634973c8a7f3c4d1b9e222082f02a4e3dcbca14 (diff)
downloadqtlocation-mapboxgl-ba4b8464dd09acd93ff2fa6931ff15fdf6def244.tar.gz
[node, build] Rename Node builds to follow convention
CI job naming convention is: <platform>-<optional-descriptor>-<buildtype>
-rw-r--r--circle.yml58
1 files changed, 29 insertions, 29 deletions
diff --git a/circle.yml b/circle.yml
index 567e4c48a8..a79c769256 100644
--- a/circle.yml
+++ b/circle.yml
@@ -22,6 +22,10 @@ workflows:
filters:
tags:
only: /node-.*/
+ - node-macos-release:
+ filters:
+ tags:
+ only: /node-.*/
- linux-clang-3.8-libcxx-debug
- linux-clang4-sanitize-address
- linux-clang4-sanitize-undefined
@@ -43,10 +47,6 @@ workflows:
ignore: /.*/
- macos-debug
- macos-debug-qt5
- - macos-release-node:
- filters:
- tags:
- only: /node-.*/
step-library:
- &generate-cache-key
@@ -157,9 +157,9 @@ step-library:
command: |
brew install cmake ccache
- - &install-macos-node-dependencies
+ - &install-node-macos-dependencies
run:
- name: Install macOS Node dependencies
+ name: Install Node macOS dependencies
command: |
brew install node@6
brew link node@6 --force --overwrite
@@ -474,6 +474,29 @@ jobs:
- *upload-render-tests-recycle-map
# ------------------------------------------------------------------------------
+ node-macos-release:
+ macos:
+ xcode: "9.4.0"
+ environment:
+ BUILDTYPE: RelWithDebInfo
+ HOMEBREW_NO_AUTO_UPDATE: 1
+ steps:
+ - checkout
+ - *install-macos-dependencies
+ - *install-node-macos-dependencies
+ - *generate-cache-key
+ - *restore-cache
+ - *reset-ccache-stats
+ - *build-node
+ - *show-ccache-stats
+ - *save-cache
+ - *run-node-macos-tests
+ - *publish-node-package
+ - *upload-render-tests
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
+
+# ------------------------------------------------------------------------------
linux-clang-3.8-libcxx-debug:
docker:
- image: mbgl/7d2403f42e:linux-clang-3.8-libcxx
@@ -886,26 +909,3 @@ jobs:
- store_artifacts:
path: test/fixtures
destination: test/fixtures
-
-# ------------------------------------------------------------------------------
- macos-release-node:
- macos:
- xcode: "9.4.0"
- environment:
- BUILDTYPE: RelWithDebInfo
- HOMEBREW_NO_AUTO_UPDATE: 1
- steps:
- - checkout
- - *install-macos-dependencies
- - *install-macos-node-dependencies
- - *generate-cache-key
- - *restore-cache
- - *reset-ccache-stats
- - *build-node
- - *show-ccache-stats
- - *save-cache
- - *run-node-macos-tests
- - *publish-node-package
- - *upload-render-tests
- - *collect-xcode-build-logs
- - *upload-xcode-build-logs