Skip to content

Commit

Permalink
Merge pull request #343 from pelias/ci-and-nodejs-updates
Browse files Browse the repository at this point in the history
CI and Node.js updates
  • Loading branch information
orangejulius authored Oct 31, 2018
2 parents 2372756 + e265a8f commit e1b5a21
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
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 )
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import.

## Requirements

- Node.js '6.0' or greater
- Node.js. See [Pelias Software requirements](https://github.com/pelias/documentation/blob/master/requirements.md) for supported versions.

### Installation

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"url": "https://github.com/mapzen/pelias-geonames/issues"
},
"engines": {
"node": ">=6.0.0",
"node": ">=8.0.0",
"npm": ">=1.4.3",
"elasticsearch": ">=1.1.1"
},
Expand Down Expand Up @@ -72,7 +72,7 @@
"test"
],
"release": {
"branch": "production",
"branch": "master",
"success": []
}
}

0 comments on commit e1b5a21

Please sign in to comment.