Commit bbc8aae6 authored by Alex Kalderimis's avatar Alex Kalderimis

Consolidate graphql verification tasks

This combines our schema and docs verification tasks with the new query
validation task.

Since the new task is not doc specific, the rules section for this has
been renamed.
parent 6e515cdd
...@@ -110,4 +110,4 @@ include: ...@@ -110,4 +110,4 @@ include:
- local: .gitlab/ci/notify.gitlab-ci.yml - local: .gitlab/ci/notify.gitlab-ci.yml
- local: .gitlab/ci/dast.gitlab-ci.yml - local: .gitlab/ci/dast.gitlab-ci.yml
- local: .gitlab/ci/workhorse.gitlab-ci.yml - local: .gitlab/ci/workhorse.gitlab-ci.yml
- local: .gitlab/ci/graphql-ci.yml - local: .gitlab/ci/graphql.gitlab-ci.yml
...@@ -84,16 +84,3 @@ ui-docs-links lint: ...@@ -84,16 +84,3 @@ ui-docs-links lint:
needs: [] needs: []
script: script:
- bundle exec haml-lint -i DocumentationLinks - bundle exec haml-lint -i DocumentationLinks
graphql-reference-verify:
extends:
- .default-retry
- .rails-cache
- .default-before_script
- .docs:rules:graphql-reference-verify
- .use-pg11
stage: test
needs: ["setup-test-env"]
script:
- bundle exec rake gitlab:graphql:check_docs
- bundle exec rake gitlab:graphql:check_schema
graphql-query-validate: graphql-verify:
extends: extends:
- .static-analysis-base - .default-retry
- .rails-cache
- .default-before_script
- .graphql:rules:graphql-verify
stage: test stage: test
needs: ["setup-test-env"] needs: ["setup-test-env"]
script: script:
- bundle exec rake gitlab:graphql:validate - bundle exec rake gitlab:graphql:validate
- bundle exec rake gitlab:graphql:check_docs
- bundle exec rake gitlab:graphql:check_schema
...@@ -349,7 +349,11 @@ ...@@ -349,7 +349,11 @@
changes: *docs-patterns changes: *docs-patterns
when: on_success when: on_success
.docs:rules:graphql-reference-verify: ##################
# GraphQL rules #
##################
.graphql:rules:graphql-verify:
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment