Merge pull request #3926 from ethcore/split-ci-intermediate-stage

Split intermediate stage into two.
This commit is contained in:
Gav Wood 2016-12-20 18:42:11 +01:00 committed by GitHub
commit b369939f20

View File

@ -1,6 +1,7 @@
stages: stages:
- test - test
- js-build - js-build
- push-release
- build - build
variables: variables:
GIT_DEPTH: "3" GIT_DEPTH: "3"
@ -506,7 +507,6 @@ js-release:
- master - master
- beta - beta
- stable - stable
- triggers
image: ethcore/rust:stable image: ethcore/rust:stable
before_script: before_script:
- export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l) - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
@ -515,6 +515,17 @@ js-release:
script: script:
- echo $JS_FILES_MODIFIED - echo $JS_FILES_MODIFIED
- if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
- curl --data "secret=$RELEASES_SECRET" http://icarus.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
tags: tags:
- javascript - javascript
push-release:
stage: push-release
only:
- beta
- tags
- stable
- triggers
image: ethcore/rust:stable
script:
- curl --data "secret=$RELEASES_SECRET" http://icarus.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
tags:
- curl