Skip to content

Commit

Permalink
Merge pull request pelias#1187 from pelias/semantic-release-build-stage
Browse files Browse the repository at this point in the history
Replace semantic-release dependency with TravisCI build stages
  • Loading branch information
orangejulius authored Sep 6, 2018
2 parents 7d9e3e2 + fe69061 commit 66fb60c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 37 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 && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | sh -
32 changes: 0 additions & 32 deletions .circleci/docker.sh

This file was deleted.

8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ matrix:
script: npm run travis
before_install:
- npm i -g npm
after_success:
- npx semantic-release
branches:
except:
- /^v\d+\.\d+\.\d+$/
jobs:
include:
- stage: release
node_js: 10
script: curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
if: branch = production
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
"pelias-mock-logger": "^1.3.0",
"precommit-hook": "^3.0.0",
"proxyquire": "^2.0.0",
"semantic-release": "^15.1.4",
"source-map": "^0.7.0",
"tap-dot": "^2.0.0",
"tape": "^4.5.1",
Expand Down

0 comments on commit 66fb60c

Please sign in to comment.