summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-23 10:09:55 +0100
committerRémy Coutable <remy@rymai.me>2017-03-23 23:30:27 +0100
commit8720f1d634e714fc73840c9c01dc67b9ea7f3784 (patch)
tree6d67cdcd5d8a8273795bcead8ad673aa826a276c /.gitlab-ci.yml
parent6eeba4b18214e054bbdebd66f53586fc09256130 (diff)
downloadgitlab-ce-8720f1d634e714fc73840c9c01dc67b9ea7f3784.tar.gz
Fetch deeper the tested branch before fetching master
The tested branch is clone with a deep of 20 so if it has more than 20 commits, we need to deepen its hitory to be able to find the merge-base with origin/master. Also, detect prefixed EE branch as well, i.e. `ee-<branch>`. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24627b5faca..2cb77f7efca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,10 +206,9 @@ rake ee_compat_check:
- /^[\d-]+-stable(-ee)?$/
allow_failure: yes
cache:
- key: "ruby233-ee_compat_check_repo"
+ key: "ee_compat_check_repo"
paths:
- - ee_compat_check/repo/
- - vendor/ruby
+ - ee_compat_check/ee-repo/
artifacts:
name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
when: on_failure