grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci: fix merge leftovers

Browse Source
This commit is contained in:
5chdn 2018-08-24 15:54:10 -04:00
parent 200a82608a
commit 44bf39d31a
No known key found for this signature in database
GPG Key ID: 1A40871B597F5F80
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.gitlab-ci.yml
View File

@ -1,16 +1,12 @@
stages: stages:
- test - test
- build - build
<<<<<<< HEAD
- package - package
- publish - publish
- docs - docs
image: parity/rust:gitlab-ci image: parity/rust:gitlab-ci
=======
- docs
>>>>>>> master
variables: variables:
CI_SERVER_NAME: "GitLab CI" CI_SERVER_NAME: "GitLab CI"
CARGO_HOME: "${CI_PROJECT_DIR}/cargo" CARGO_HOME: "${CI_PROJECT_DIR}/cargo"
@ -288,7 +284,6 @@ publish:github:s3:
script: script:
- scripts/gitlab/push.sh - scripts/gitlab/push.sh
tags: tags:
<<<<<<< HEAD
- shell - shell
allow_failure: true allow_failure: true
@ -297,22 +292,6 @@ publish:github:s3:
json:rpc:docs: json:rpc:docs:
stage: docs stage: docs
=======
- rust
- rust-nightly
allow_failure: true
json-rpc-docs:
stage: docs
only:
- tags
image: parity/rust:gitlab-ci
script:
- scripts/gitlab-rpc-docs.sh
tags:
- docs
push-release:
stage: push-release
>>>>>>> master
only: only:
- tags - tags
- gitlab-next - gitlab-next