diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-30 13:42:30 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-08-30 13:42:30 +0000 |
| commit | 8e9742edca1c628817751d3e0ee77b41feaada53 (patch) | |
| tree | 42b436f086e78b4c4333ba162c0233093c728af2 | |
| parent | e4af69a77fb4a2be54b6adfa5ab3cdbfb44aecd2 (diff) | |
| parent | c10a328ec575a09ce5dcfd7012591dbdfdaf7cda (diff) | |
| download | gitlab-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
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/ee-specific-checks.gitlab-ci.yml | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27992024265..5b5527284d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,3 +41,4 @@ include: - local: .gitlab/ci/setup.gitlab-ci.yml - local: .gitlab/ci/test-metadata.gitlab-ci.yml - local: .gitlab/ci/yaml.gitlab-ci.yml + - local: .gitlab/ci/ee-specific-checks.gitlab-ci.yml 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 |