diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2021-07-02 11:39:26 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2021-07-02 11:39:26 -0700 |
| commit | 7ea1503eed9aeeabf0488066257b34bd56084ab5 (patch) | |
| tree | 98577dcb9f77ff903835ca7ef665422de18a1b3f /gitlab-templates | |
| parent | 7b4109ba6e05b7c12a64d2aef0f2d8dac9aa4ae1 (diff) | |
Fix: RTD Gitlab Triggers for Stable branch
Adds a STABLE_BRANCH variable to ensure builds run on merges to
'stable/*' branches.
Change-Id: Ib2a72e705600a6a48454acd2b74b35e46d1e9877
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'gitlab-templates')
| -rw-r--r-- | gitlab-templates/RTD.gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gitlab-templates/RTD.gitlab-ci.yml b/gitlab-templates/RTD.gitlab-ci.yml index 198ed5bdc..59b455d69 100644 --- a/gitlab-templates/RTD.gitlab-ci.yml +++ b/gitlab-templates/RTD.gitlab-ci.yml @@ -27,6 +27,7 @@ variables: PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" DOCS_DIRECTORY: "docs" DOCS_REQUIREMENTS: "$DOCS_DIRECTORY/requirements.txt" + STABLE_BRANCH: "stable/*" .docs-cache: &docs-cache paths: @@ -58,9 +59,11 @@ docs-build: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCS_SCHEDULE != "true" when: never - - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - $DOCS_DIRECTORY/**/* + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $STABLE_BRANCH docs-link-check: stage: test @@ -78,9 +81,11 @@ docs-link-check: rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCS_SCHEDULE != "true" when: never - - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - $DOCS_DIRECTORY/**/* + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $STABLE_BRANCH pages: stage: deploy |