From 022a718b6f1ef8bfc0230fec63c09cf91f7fd1f2 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Sun, 6 Nov 2016 00:02:44 +0700 Subject: [PATCH] Update gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da89a16ba..733c77dd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -391,7 +391,7 @@ test-rust-stable: image: ethcore/rust:stable before_script: - git submodule update --init --recursive - - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF_NAME $CI_BUILD_REF_NAME@{1} | grep \.js | wc -l) + - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF $(git merge-base $CI_BUILD_REF master) | grep \.js | wc -l) - echo $JS_FILES_MODIFIED - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi script: