diff options
| author | Sarah German <sgerman@gitlab.com> | 2023-03-10 21:14:01 +0300 |
|---|---|---|
| committer | Sarah German <sgerman@gitlab.com> | 2023-03-10 21:14:01 +0300 |
| commit | ad0043411b0ff8bcc30620a593576cffea7ce474 (patch) | |
| tree | 99379caa379b87a4ce3dfe9e0f493ba5d9038f6e | |
| parent | 2cf57151306fc87a94e52b61130db1dad82508a2 (diff) | |
| parent | f1f77b68e812636414465d317f384e4a4c8976da (diff) | |
Merge branch 'fix-gps-test-pipelines' into 'main'
Move search backend variable to workflow rules
Closes #1533
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3646
Merged-by: Sarah German <sgerman@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ec8dbc4..45b4f316 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,7 @@ workflow: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' variables: DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline: branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" + SEARCH_BACKEND: 'lunr' - if: '$CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TYPE == "delete_environments"' variables: DOCS_PROJECT_PIPELINE_TYPE: "Monthly stopped environments cleanup pipeline" @@ -62,6 +63,7 @@ workflow: - if: '$CI_PIPELINE_SOURCE == "trigger"' variables: DOCS_PROJECT_PIPELINE_TYPE: "Upstream review app pipeline" + SEARCH_BACKEND: 'lunr' # Allow branch pipelines for the default branch and stable branches named XX.X - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' variables: diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index 13b0344b..0dc25c4a 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -75,8 +75,6 @@ compile_dev: extends: - .rules_dev - .build_base - variables: - SEARCH_BACKEND: 'lunr' script: - !reference [".compile-and-minify-scripts", "script"] - !reference [".gzip-scripts", "script"] @@ -88,8 +86,6 @@ compile_upstream_review_app: extends: - .rules_upstream_review_app - .build_base - variables: - SEARCH_BACKEND: 'lunr' script: - !reference [".compile-and-minify-scripts", "script"] |