summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-08-30 13:42:30 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-08-30 13:42:30 +0000
commit8e9742edca1c628817751d3e0ee77b41feaada53 (patch)
tree42b436f086e78b4c4333ba162c0233093c728af2 /.gitlab
parente4af69a77fb4a2be54b6adfa5ab3cdbfb44aecd2 (diff)
parentc10a328ec575a09ce5dcfd7012591dbdfdaf7cda (diff)
downloadgitlab-ce-8e9742edca1c628817751d3e0ee77b41feaada53.tar.gz
Merge branch 'move-ee-ci-config-to-ce' into 'master'
Don't use ee/.gitlab/ for CI config files See merge request gitlab-org/gitlab-ce!32351
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/ee-specific-checks.gitlab-ci.yml22
1 files changed, 22 insertions, 0 deletions
diff --git a/.gitlab/ci/ee-specific-checks.gitlab-ci.yml b/.gitlab/ci/ee-specific-checks.gitlab-ci.yml
new file mode 100644
index 00000000000..babb89b4606
--- /dev/null
+++ b/.gitlab/ci/ee-specific-checks.gitlab-ci.yml
@@ -0,0 +1,22 @@
+.ee-specific-check:
+ extends: .default-tags
+ dependencies: []
+ only:
+ - branches@gitlab-org/gitlab-ee
+ except:
+ - master
+ - tags
+ - /[\d-]+-stable(-ee)?/
+ - /[\d-]+-auto-deploy-\d{7}/
+ - /^security-/
+ - /\bce\-to\-ee\b/
+
+ee-files-location-check:
+ extends: .ee-specific-check
+ script:
+ - scripts/ee-files-location-check
+
+ee-specific-lines-check:
+ extends: .ee-specific-check
+ script:
+ - scripts/ee-specific-lines-check