Update gitlab-ci

rename stages
This commit is contained in:
Denis S. Soldatov aka General-Beck 2016-11-04 15:51:35 +07:00 committed by GitHub
parent 27472dfe44
commit 1ac002ec4d

View File

@ -382,20 +382,16 @@ test-rust-stable:
- git submodule update --init --recursive - git submodule update --init --recursive
- export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF_NAME $(git merge-base $CI_BUILD_REF_NAME master) | grep \.js | wc -l) - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF_NAME $(git merge-base $CI_BUILD_REF_NAME master) | grep \.js | wc -l)
- echo $JS_FILES_MODIFIED - echo $JS_FILES_MODIFIED
- if [ -z $JS_FILES_MODIFIED ]; then ./js/scripts/install-deps.sh; fi - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
script: script:
- export RUST_BACKTRACE=1 - export RUST_BACKTRACE=1
- echo $JS_FILES_MODIFIED - echo $JS_FILES_MODIFIED
- if [ -z $JS_FILES_MODIFIED ]; then ./js/scripts/lint.sh&&./js/scripts/test.sh&&./js/scripts/build.sh; else ./test.sh $CARGOFLAGS --no-release; fi - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
tags: tags:
- rust - rust
- rust-stable - rust-stable
js-tests: js-tests:
stage: test stage: js-test
only:
- jg*
- ng*
- ui*
image: ethcore/rust:stable image: ethcore/rust:stable
before_script: before_script:
- ./js/scripts/install-deps.sh - ./js/scripts/install-deps.sh
@ -406,12 +402,8 @@ js-tests:
tags: tags:
- javascript-test - javascript-test
js-release: js-release:
stage: build stage: js-build
image: ethcore/rust:stable image: ethcore/rust:stable
only:
- jg*
- ng*
- ui*
before_script: before_script:
- ./js/scripts/install-deps.sh - ./js/scripts/install-deps.sh
script: script: