From c23af0063d7a3224d968c0ea538de09d9d7368f1 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Mon, 29 Oct 2018 13:42:01 +0100 Subject: [PATCH 1/3] Add node v11 to the test runners --- .circleci/config.yml | 15 +++++++++++++++ appveyor.yml | 1 + 2 files changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68ffeebf..ee5420bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,11 @@ jobs: - image: node:10 working_directory: ~/repo-linux-node-v10 steps: *build-steps + build-linux-node-v11: + docker: + - image: node:11 + working_directory: ~/repo-linux-node-v11 + steps: *build-steps build-osx-node-v6: macos: xcode: "9.0" @@ -89,6 +94,14 @@ jobs: - brew install node@10 working_directory: ~/repo-osx-node-v10 steps: *build-steps + build-osx-node-v11: + macos: + xcode: "9.0" + dependencies: + override: + - brew install node@11 + working_directory: ~/repo-osx-node-v11 + steps: *build-steps workflows: version: 2 @@ -97,7 +110,9 @@ workflows: - build-linux-node-v6 - build-linux-node-v8 - build-linux-node-v10 + - build-linux-node-v11 - build-osx-node-v6 - build-osx-node-v8 - build-osx-node-v10 + - build-osx-node-v11 diff --git a/appveyor.yml b/appveyor.yml index 9d469f89..da6e3014 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ environment: - nodejs_version: "8" - nodejs_version: "9" - nodejs_version: "10" + - nodejs_version: "11" platform: - x86 - x64 From 1f4dfa76039ca8e45f2c537e1c4da5d70efaff64 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Mon, 29 Oct 2018 13:56:09 +0100 Subject: [PATCH 2/3] Update readme (Node versions and CLI) --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 536b0802..599607c8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ A free and open visual editor for the [Mapbox GL styles](https://www.mapbox.com/ targeted at developers and map designers. - :link: Design your maps online at **** (all in local storage) -- :link: Use the [Maputnik CLI](https://github.com/maputnik/editor/wiki/Maputnik-CLI) for local style development Mapbox has built one of the best and most amazing OSS ecosystems. A key component to ensure its longevity and independance is an OSS map designer. @@ -40,10 +39,7 @@ The documentation can be found in the [Wiki](https://github.com/maputnik/editor/ Maputnik is written in ES6 and is using [React](https://github.com/facebook/react) and [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/). -We ensure building and developing Maputnik works with - -- Linux, OSX and Windows -- Node >4 +We ensure building and developing Maputnik works with the [current active LTS and above](https://github.com/nodejs/Release#release-schedule). Install the deps, start the dev server and open the web browser on `http://localhost:8888/`. From 00f646d4899c03099ee016ec2cfaaee9517af313 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Tue, 30 Oct 2018 21:08:42 +0100 Subject: [PATCH 3/3] Update test runners and readme --- .circleci/config.yml | 15 --------------- README.md | 4 ++-- appveyor.yml | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee5420bf..68ffeebf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,11 +65,6 @@ jobs: - image: node:10 working_directory: ~/repo-linux-node-v10 steps: *build-steps - build-linux-node-v11: - docker: - - image: node:11 - working_directory: ~/repo-linux-node-v11 - steps: *build-steps build-osx-node-v6: macos: xcode: "9.0" @@ -94,14 +89,6 @@ jobs: - brew install node@10 working_directory: ~/repo-osx-node-v10 steps: *build-steps - build-osx-node-v11: - macos: - xcode: "9.0" - dependencies: - override: - - brew install node@11 - working_directory: ~/repo-osx-node-v11 - steps: *build-steps workflows: version: 2 @@ -110,9 +97,7 @@ workflows: - build-linux-node-v6 - build-linux-node-v8 - build-linux-node-v10 - - build-linux-node-v11 - build-osx-node-v6 - build-osx-node-v8 - build-osx-node-v10 - - build-osx-node-v11 diff --git a/README.md b/README.md index 599607c8..073c1f39 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The documentation can be found in the [Wiki](https://github.com/maputnik/editor/ Maputnik is written in ES6 and is using [React](https://github.com/facebook/react) and [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/). -We ensure building and developing Maputnik works with the [current active LTS and above](https://github.com/nodejs/Release#release-schedule). +We ensure building and developing Maputnik works with the [current active LTS Node.js version and above](https://github.com/nodejs/Release#release-schedule). Install the deps, start the dev server and open the web browser on `http://localhost:8888/`. @@ -75,7 +75,7 @@ For testing we use [webdriverio](http://webdriver.io) and [selenium-standalone]( [selenium-standalone](https://github.com/vvo/selenium-standalone) starts a server that will launch browsers on your local machine. We use chrome so you **must** have chrome installed on your machine. -Now open and terminal and run the following. This will install the drivers on your local machine +Now open a terminal and run the following. This will install the drivers on your local machine ``` ./node_modules/.bin/selenium-standalone install diff --git a/appveyor.yml b/appveyor.yml index da6e3014..bfe10868 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,7 @@ image: Visual Studio 2017 environment: matrix: - nodejs_version: "8" - - nodejs_version: "9" - nodejs_version: "10" - - nodejs_version: "11" platform: - x86 - x64