From 7a7751e32bbf4a69b23a18276ff74a318be9b9b8 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 30 Oct 2018 13:25:19 -0400 Subject: [PATCH 1/5] Add bash dependency to CircleCI script --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ed292fe..c1f237c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,4 +9,4 @@ jobs: - setup_remote_docker - run: name: Build and push image to Docker Hub - command: apk --no-cache add curl && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | sh - + command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash - From d86419cd76112e75ba16d19a5eab2235b231834d Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 30 Oct 2018 13:26:57 -0400 Subject: [PATCH 2/5] chore(release): Run releases off master branch Connects https://github.com/pelias/pelias/issues/749 --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dd2c224..60235aa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ jobs: - stage: release node_js: 10 script: curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash - - if: branch = production + if: branch = master diff --git a/package.json b/package.json index 45ea5e48..f5fd61cc 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "test" ], "release": { - "branch": "production", + "branch": "master", "success": [] } } From cae3c9acbd3e41560656ccdee02573c8d47302ad Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 30 Oct 2018 13:28:37 -0400 Subject: [PATCH 3/5] feat(release): Skip semantic-release run on pull reqeusts This should speed up our CI slightly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60235aa0..56a3c821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ jobs: - stage: release node_js: 10 script: curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash - - if: branch = master + if: (branch = master) AND ( type = push ) From 882adb2b29984dc2febc491c75511cf60c3cb857 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 30 Oct 2018 13:31:42 -0400 Subject: [PATCH 4/5] feat(Node.js): Drop support for Node.js 6 Connects https://github.com/pelias/pelias/issues/752 --- .travis.yml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56a3c821..2d879243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: node_js notifications: email: false node_js: - - 6 - 8 - 10 matrix: diff --git a/package.json b/package.json index f5fd61cc..80e5f79d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "url": "https://github.com/pelias/api/issues" }, "engines": { - "node": ">=6.0.0" + "node": ">=8.0.0" }, "dependencies": { "@mapbox/geojson-extent": "^0.3.1", From 87923148e7484bcc4f56798c45ebe617737988ec Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 30 Oct 2018 13:32:13 -0400 Subject: [PATCH 5/5] feat(doc): Point to common requirements doc This will prevent us from having to update supported Node.js versions in many places for each release --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d802444..c2c475f9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,9 @@ Full documentation for the Pelias API lives in the [pelias/documentation](https: ## Install Dependencies -Note: Pelias requires Node.js v6 or newer +The Pelias API has no dependencies beyond Node.js + +See [Pelias Software requirements](https://github.com/pelias/documentation/blob/master/requirements.md) for the supported and recommended versions. ```bash npm install