Commit ccbd9099 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'patch-179' into 'master'

Yaml formatting improvements

See merge request gitlab-org/gitlab!36007
parents 4ba5d833 a4db78c9
...@@ -1341,7 +1341,7 @@ docker build: ...@@ -1341,7 +1341,7 @@ docker build:
script: docker build -t my-image:$CI_COMMIT_REF_SLUG . script: docker build -t my-image:$CI_COMMIT_REF_SLUG .
rules: rules:
- changes: - changes:
- Dockerfile - Dockerfile
when: manual when: manual
allow_failure: true allow_failure: true
``` ```
...@@ -1367,7 +1367,7 @@ job: ...@@ -1367,7 +1367,7 @@ job:
script: docker build -t my-image:$CI_COMMIT_REF_SLUG . script: docker build -t my-image:$CI_COMMIT_REF_SLUG .
rules: rules:
- exists: - exists:
- Dockerfile - Dockerfile
``` ```
You can also use glob patterns to match multiple files in any directory within You can also use glob patterns to match multiple files in any directory within
...@@ -1380,7 +1380,7 @@ job: ...@@ -1380,7 +1380,7 @@ job:
script: bundle exec rspec script: bundle exec rspec
rules: rules:
- exists: - exists:
- spec/**.rb - spec/**.rb
``` ```
NOTE: **Note:** NOTE: **Note:**
...@@ -1427,8 +1427,8 @@ docker build: ...@@ -1427,8 +1427,8 @@ docker build:
rules: rules:
- if: '$VAR == "string value"' - if: '$VAR == "string value"'
changes: # Will include the job and set to when:manual if any of the follow paths match a modified file. changes: # Will include the job and set to when:manual if any of the follow paths match a modified file.
- Dockerfile - Dockerfile
- docker/scripts/* - docker/scripts/*
when: manual when: manual
# - when: never would be redundant here, this is implied any time rules are listed. # - when: never would be redundant here, this is implied any time rules are listed.
``` ```
......
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