From 1ac002ec4d383588d1d146780fa51ddca3d8a9aa Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 4 Nov 2016 15:51:35 +0700 Subject: [PATCH] Update gitlab-ci rename stages --- .gitlab-ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 048b52e9a..4f5bf9f53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,20 +382,16 @@ test-rust-stable: - 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) - 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: - export RUST_BACKTRACE=1 - 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: - rust - rust-stable js-tests: - stage: test - only: - - jg* - - ng* - - ui* + stage: js-test image: ethcore/rust:stable before_script: - ./js/scripts/install-deps.sh @@ -406,12 +402,8 @@ js-tests: tags: - javascript-test js-release: - stage: build + stage: js-build image: ethcore/rust:stable - only: - - jg* - - ng* - - ui* before_script: - ./js/scripts/install-deps.sh script: