Merge branch 'improve-ee_check_compat-again' into 'master'

Fetch deeper the tested branch before fetching master See merge request !9484

Merge branch 'improve-ee_check_compat-again' into 'master'
Fetch deeper the tested branch before fetching master See merge request !9484
d561881b · Sean McGivern · 711f09a1 · 98b87a6e · d561881b · d561881b
Commit d561881b authored Mar 24, 2017 by Sean McGivern
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 190 additions and 110 deletions

.gitlab-ci.yml .gitlab-ci.yml +2 -3

lib/gitlab/ee_compat_check.rb lib/gitlab/ee_compat_check.rb +188 -107

No files found.
--- 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/
+      - ee_compat_check/ee-repo/
-      - vendor/ruby
  artifacts:
    name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
    when: on_failure

--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb