diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 12:10:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 12:10:36 +0000 |
| commit | 797182cd82922765fe79a13bc0ed6bd5672d4283 (patch) | |
| tree | 82d0ea1a8378560de4aeb5c1e446b74282035d60 /.gitlab | |
| parent | a060caf3db3090d75284a71a08ab1cf697afad97 (diff) | |
| download | gitlab-ce-797182cd82922765fe79a13bc0ed6bd5672d4283.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 59eabf2770c..f5e12f0730c 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -311,6 +311,14 @@ db:check-schema: script: - source scripts/schema_changed.sh +db:check-migrations: + extends: + - .db-job-base + - .rails:rules:ee-and-foss-mr-with-migration + script: + - scripts/validate_migration_schema + allow_failure: true + db:migrate-from-v12.10.0: extends: .db-job-base variables: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 61e6b93a777..74f8dba8036 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -507,6 +507,12 @@ - <<: *if-merge-request changes: *db-patterns +.rails:rules:ee-and-foss-mr-with-migration: + rules: + - <<: *if-merge-request + changes: *db-patterns + - <<: *if-merge-request-title-run-all-rspec + .rails:rules:ee-and-foss-unit: rules: - changes: *backend-patterns |