Commit aa5cc165 authored by Evan Read's avatar Evan Read

Merge branch 'rules-docs-update' into 'master'

Documentation: Correct spelling of MR branch name variable in job:rules documentation

See merge request gitlab-org/gitlab!18184
parents 33009d42 bec0c5f0
...@@ -755,7 +755,7 @@ the status of other builds: ...@@ -755,7 +755,7 @@ the status of other builds:
job: job:
script: "echo Hello, Rules!" script: "echo Hello, Rules!"
rules: rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH == "master"' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
when: always when: always
- if: '$VAR =~ /pattern/' - if: '$VAR =~ /pattern/'
when: manual when: manual
...@@ -781,11 +781,11 @@ evaluated should be conjoined into a single expression using `&&` or `||`. For e ...@@ -781,11 +781,11 @@ evaluated should be conjoined into a single expression using `&&` or `||`. For e
job: job:
script: "echo Hello, Rules!" script: "echo Hello, Rules!"
rules: rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH =~ /^feature/ && $CI_MERGE_REQUEST_TARGET_BRANCH == "master"' # This rule will be evaluated - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' # This rule will be evaluated
when: always when: always
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH =~ /^feature/' # This rule will only be evaluated if the target branch is not "master" - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/' # This rule will only be evaluated if the target branch is not "master"
when: manual when: manual
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH' # If neither of the first two match but the simple presence does, we set to "on_success" by default - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME' # If neither of the first two match but the simple presence does, we set to "on_success" by default
``` ```
If none of the provided rules match, the job will be set to `when:never`, and If none of the provided rules match, the job will be set to `when:never`, and
......
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