Skip to content

Commit

Permalink
Merge pull request #20 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 Nov 3, 2018
2 parents 45c5542 + 1deaa1a commit d9f704c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 41 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 )
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
"devDependencies": {
"precommit-hook": "^3.0.0"
},
"engines": {
"node": ">=8.0.0"
},
"repository": {
"type": "git",
"url": "https://github.com/pelias/transit.git"
Expand All @@ -47,12 +50,11 @@
"homepage": "https://github.com/pelias/transit",
"pre-commit": [
"lint",
"prune",
"validate",
"test"
],
"release": {
"branch": "production",
"branch": "master",
"success": []
}
}

0 comments on commit d9f704c

Please sign in to comment.