Skip to content

Commit

Permalink
Merge branch 'fix-ci'
Browse files Browse the repository at this point in the history
  • Loading branch information
hypnoglow committed Oct 16, 2017
2 parents e1c6db2 + 7ccb683 commit 7e4e589
Showing 1 changed file with 31 additions and 13 deletions.
44 changes: 31 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ jobs:
- run: ./.circleci/testcover.sh
- run: bash <(curl -s https://codecov.io/bash)
- run: go build -o bin/helms3 ./cmd/helms3
- deploy:
name: goreleaser
command: |
if [ -n "$CIRCLE_TAG" ]; then
curl -sL https://git.io/goreleaser | bash
fi
test-integration:
docker:
- image: circleci/golang:1.9
Expand Down Expand Up @@ -62,16 +56,40 @@ jobs:
- run:
name: Run tests
command: ./sh/integration-tests.sh
release:
docker:
- image: circleci/golang:1.9
working_directory: /go/src/github.com/hypnoglow/helm-s3
steps:
- checkout
- run: go get -u -v github.com/golang/dep/cmd/dep
- run: dep ensure -v
- deploy:
name: goreleaser
command: |
if [ -n "$CIRCLE_TAG" ]; then
curl -sL https://git.io/goreleaser | bash
fi
workflows:
version: 2
build_and_test:
build_test_release:
jobs:
- build
- build:
filters:
tags:
only: /.*/
- test-integration:
filters:
tags:
only: /.*/
requires:
- build

deployment:
trigger_tag:
tag: /.*/
- build
- release:
filters:
tags:
only: /.*/
branches:
ignore: /.*/
requires:
- test-integration

0 comments on commit 7e4e589

Please sign in to comment.