diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-05 09:26:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-05 09:26:24 +0000 |
| commit | 45aef6ff525e15f4029d186166b9eddb330e3634 (patch) | |
| tree | 739e034b4a2863c30e8158eee585b0ac32b723c9 /.gitlab-ci.yml | |
| parent | 7d12991223ff260a98ef397ddc2e26fa59950e4a (diff) | |
| parent | 72fa064000a5434456544568325ee7b583dbef90 (diff) | |
| download | gitlab-ce-45aef6ff525e15f4029d186166b9eddb330e3634.tar.gz | |
Merge branch 'docs/use-ref-slug-for-docs-review' into 'master'
Refactor the review-docs workflow
See merge request gitlab-org/gitlab-ce!20365
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d024b0bccea..49c4b059dbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,10 +269,10 @@ package-and-qa: <<: *single-script-job-variables SCRIPT_NAME: trigger-build-docs environment: - name: review-docs/$CI_COMMIT_REF_NAME + name: review-docs/$CI_COMMIT_REF_SLUG # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693 - url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX + url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX on_stop: review-docs-cleanup # Trigger a manual docs build in gitlab-docs only on non docs-only branches. @@ -307,7 +307,7 @@ review-docs-cleanup: <<: *review-docs stage: post-cleanup environment: - name: review-docs/$CI_COMMIT_REF_NAME + name: review-docs/$CI_COMMIT_REF_SLUG action: stop when: manual script: |