status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove ci merge branches if nightly merge fails (#6369)

This commit is contained in:
Alvin Huang 2019-08-21 15:56:27 -04:00 committed by GitHub
parent 5515e094f4
commit ce9cfc773d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -90,7 +90,7 @@ jobs:
parallelism: 4
environment:
<<: *ENVIRONMENT
GOTAGS: '' # No tags for OSS but there are for enterprise
GOTAGS: "" # No tags for OSS but there are for enterprise
steps:
- checkout
- restore_cache: # restore cache from dev-build job
@ -116,7 +116,7 @@ jobs:
- image: *GOLANG_IMAGE
environment:
<<: *ENVIRONMENT
GOTAGS: '' # No tags for OSS but there are for enterprise
GOTAGS: "" # No tags for OSS but there are for enterprise
steps:
- checkout
- restore_cache: # restore cache from dev-build job
@ -466,8 +466,7 @@ jobs:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.8.0"
steps:
&ENVOY_INTEGRATION_TEST_STEPS
steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout
# Get go binary from workspace
- attach_workspace:
@ -587,6 +586,7 @@ jobs:
} \
] \
}" ${CONSUL_SLACK_WEBHOOK_URL}
git push --delete origin "${git_merge_branch}"
exit 1
fi