Skip to content

Commit

Permalink
Merge pull request #465 from pelias/ci-and-node-version-updates
Browse files Browse the repository at this point in the history
CI and Node.js version updates
  • Loading branch information
orangejulius authored Nov 3, 2018
2 parents 59299a1 + 86c3089 commit d54e5fa
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ jobs:
build:
working_directory: /app
docker:
- image: docker:17.05.0-ce-git
- image: docker:18.06.1-ce-git
steps:
- checkout
- setup_remote_docker
- run:
name: Build and push image to Docker Hub
command: sh .circleci/docker.sh
command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -
35 changes: 0 additions & 35 deletions .circleci/docker.sh

This file was deleted.

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: node_js
notifications:
email: false
node_js:
- 6
- 8
- 10
matrix:
Expand All @@ -19,4 +18,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) AND ( type = push )
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ It includes logic for filtering to select only data relevant for geocoding, tran

## Prerequisites

* NodeJS `6.0.0` or newer (the latest in the Node 8 series is currently recommended)
* Elasticsearch 2.3+ (support for version 1.x has been deprecated).
See [Pelias software requirements](https://github.com/pelias/documentation/blob/master/requirements.md)

## Clone and Install dependencies

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "pelias-openstreetmap",
"version": "0.0.0-development",
"engines": {
"node": ">=6.11.4",
"node": ">=8.0.0",
"npm": ">=1.4.3",
"elasticsearch": ">=1.3.4"
},
"author": "mapzen",
"author": "pelias",
"description": "Pelias openstreetmap utilities",
"homepage": "https://github.com/mapzen/pelias-openstreetmap",
"license": "MIT",
Expand Down Expand Up @@ -76,7 +76,7 @@
"test"
],
"release": {
"branch": "production",
"branch": "master",
"success": []
}
}

0 comments on commit d54e5fa

Please sign in to comment.