From 6aca6f5aab9a7306e5690d730474598910a4af3d Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Fri, 16 Jun 2017 12:36:34 +0800 Subject: [PATCH] ci check_commit_msg: Use CI_COMMIT_SHA to avoid ambiguity --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc2c593817..a9d0d8d587 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -357,9 +357,10 @@ check_commit_msg: before_script: - echo "skip update submodule" script: - - git checkout ${CI_COMMIT_REF_NAME} + - git status + - git log -n10 --oneline # commit start with "WIP: " need to be squashed before merge - - 'git log --pretty=%s master..${CI_COMMIT_REF_NAME} | grep "^WIP: " || exit 0 && exit 1' + - 'git log --pretty=%s master.. -- | grep "^WIP: " && exit 1 || exit 0' check_submodule_sync: stage: deploy