summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-09-15 05:32:51 +0000
committerStan Hu <stanhu@gmail.com>2016-09-15 05:32:51 +0000
commit0a8b66302c2869a369a3a563c7093939487a2b25 (patch)
treec77793c62c954bd2b576eb3867e399469979a8ee
parent5c8f0065871fcb5ea6e053f374f6b5fae2b5d398 (diff)
parentd22918a1f017d6aa4af6a682c7266c95d909d9f9 (diff)
downloadgitlab-ce-0a8b66302c2869a369a3a563c7093939487a2b25.tar.gz
Merge branch 'sh-allow-flay-flog-failure' into 'master'
Allow flay and flog to fail for now flay and flog started working somehow (despite #17858). Disabling them for now since the broken builds are impeding progress. See merge request !6360
-rw-r--r--.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5eef681d0e..b167fc74996 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,8 +209,12 @@ rubocop: *exec
rake haml_lint: *exec
rake scss_lint: *exec
rake brakeman: *exec
-rake flog: *exec
-rake flay: *exec
+rake flog:
+ <<: *exec
+ allow_failure: yes
+rake flay:
+ <<: *exec
+ allow_failure: yes
license_finder: *exec
rake downtime_check: *exec