Merge branch 'fix-immediate' into 'development'
fix(ci): remove spaces from regex exists and changes See merge request nofusscomputing/projects/gitlab-ci!56
This commit is contained in:
@ -102,17 +102,17 @@ variables:
|
|||||||
$CI_COMMIT_BRANCH == "master" &&
|
$CI_COMMIT_BRANCH == "master" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
- if: # condition_dev_branch_push
|
- if: # condition_dev_branch_push
|
||||||
$CI_COMMIT_BRANCH == "development" &&
|
$CI_COMMIT_BRANCH == "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{dockerfile, dockerfile.j2, includes/**}'
|
- '{dockerfile,dockerfile.j2,includes/**}'
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
@ -121,10 +121,10 @@ variables:
|
|||||||
$CI_COMMIT_BRANCH != "development" &&
|
$CI_COMMIT_BRANCH != "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{dockerfile, dockerfile.j2, includes/**}'
|
- '{dockerfile,dockerfile.j2,includes/**}'
|
||||||
compare_to: 'development'
|
compare_to: 'development'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
|
@ -99,24 +99,24 @@
|
|||||||
$CI_COMMIT_TAG != null &&
|
$CI_COMMIT_TAG != null &&
|
||||||
$CI_COMMIT_BRANCH == null
|
$CI_COMMIT_BRANCH == null
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
when: on_success
|
when: on_success
|
||||||
|
|
||||||
- if: # condition_master_branch_push
|
- if: # condition_master_branch_push
|
||||||
$CI_COMMIT_BRANCH == "master" &&
|
$CI_COMMIT_BRANCH == "master" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
when: on_success
|
when: on_success
|
||||||
|
|
||||||
- if: # condition_dev_branch_push
|
- if: # condition_dev_branch_push
|
||||||
$CI_COMMIT_BRANCH == "development" &&
|
$CI_COMMIT_BRANCH == "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{dockerfile, dockerfile.j2, includes/**}'
|
- '{dockerfile,dockerfile.j2,includes/**}'
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
when: on_success
|
when: on_success
|
||||||
|
@ -41,17 +41,17 @@
|
|||||||
$CI_COMMIT_BRANCH == "master" &&
|
$CI_COMMIT_BRANCH == "master" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
- "{defaults/**,handlers/**,inventory/**,meta/**,playbooks/**,tasks/**}/*.{yaml,yml}"
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
- if: # condition_dev_branch_push
|
- if: # condition_dev_branch_push
|
||||||
$CI_COMMIT_BRANCH == "development" &&
|
$CI_COMMIT_BRANCH == "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
- "{defaults/**,handlers/**,inventory/**,meta/**,playbooks/**,tasks/**}/*.{yaml,yml}"
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
- "{defaults/**,handlers/**,inventory/**,meta/**,playbooks/**,tasks/**}/*.{yaml,yml}"
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
@ -60,10 +60,10 @@
|
|||||||
$CI_COMMIT_BRANCH != "development" &&
|
$CI_COMMIT_BRANCH != "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
- "{defaults/**,handlers/**,inventory/**,meta/**,playbooks/**,tasks/**}/*.{yaml,yml}"
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
- "{defaults/**,handlers/**,inventory/**,meta/**,playbooks/**,tasks/**}/*.{yaml,yml}"
|
||||||
compare_to: 'development'
|
compare_to: 'development'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
exists:
|
exists:
|
||||||
# - "**.md"
|
# - "**.md"
|
||||||
# - "**/**.md"
|
# - "**/**.md"
|
||||||
- '{!docs/**,!pages/**,!gitlab-ci/**, !website-template/**, **}/*.md'
|
- '{!docs/**,!pages/**,!gitlab-ci/**,!website-template/**,**}/*.md'
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
|
@ -44,12 +44,12 @@
|
|||||||
- if: '$CI_COMMIT_BRANCH &&
|
- if: '$CI_COMMIT_BRANCH &&
|
||||||
( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
|
( $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "pipeline")'
|
||||||
exists:
|
exists:
|
||||||
- '{!gitlab-ci/**/*, !website-template/**/*, !.gitlab-ci, !*gitlab-ci*, **/*, **}.{yml, yaml}'
|
- '{!gitlab-ci/**/*,!website-template/**/*,!.gitlab-ci,!*gitlab-ci*,**/*,**}.{yml,yaml}'
|
||||||
# - ".gitlab-ci*"
|
# - ".gitlab-ci*"
|
||||||
# - "**/*gitlab-ci*"
|
# - "**/*gitlab-ci*"
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{!gitlab-ci/**/*, !website-template/**/*, !.gitlab-ci, !*gitlab-ci*, **/*, **}.{yml, yaml}'
|
- '{!gitlab-ci/**/*,!website-template/**/*,!.gitlab-ci,!*gitlab-ci*,**/*,**}.{yml,yaml}'
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
@ -59,7 +59,7 @@
|
|||||||
.Gitlab_CI.Lint.YAML:
|
.Gitlab_CI.Lint.YAML:
|
||||||
variables:
|
variables:
|
||||||
YAML_LINT_PATH: ".gitlab-ci* ./**/*gitlab-ci*"
|
YAML_LINT_PATH: ".gitlab-ci* ./**/*gitlab-ci*"
|
||||||
YAML_LINT_EXTRA_ARGS: "{ extends: lint/.yamllint.yaml, ignore: [gitlab-ci/*, website-template/*] }"
|
YAML_LINT_EXTRA_ARGS: "{ extends: lint/.yamllint.yaml,ignore: [gitlab-ci/*,website-template/*] }"
|
||||||
extends:
|
extends:
|
||||||
- .yaml_lint_defaults
|
- .yaml_lint_defaults
|
||||||
rules:
|
rules:
|
||||||
@ -68,17 +68,17 @@
|
|||||||
$CI_COMMIT_BRANCH == "master" &&
|
$CI_COMMIT_BRANCH == "master" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{*, **/**, **}/*gitlab-ci*'
|
- '{*,**/**,**}/*gitlab-ci*'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
- if: # condition_dev_branch_push
|
- if: # condition_dev_branch_push
|
||||||
$CI_COMMIT_BRANCH == "development" &&
|
$CI_COMMIT_BRANCH == "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{*, **/**, **}/*gitlab-ci*'
|
- '{*,**/**,**}/*gitlab-ci*'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{*, **/**, **}/*gitlab-ci*'
|
- '{*,**/**,**}/*gitlab-ci*'
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
@ -87,10 +87,10 @@
|
|||||||
$CI_COMMIT_BRANCH != "development" &&
|
$CI_COMMIT_BRANCH != "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{*, **/**, **}/*gitlab-ci*'
|
- '{*,**/**,**}/*gitlab-ci*'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{*, **/**, **}/*gitlab-ci*'
|
- '{*,**/**,**}/*gitlab-ci*'
|
||||||
compare_to: 'development'
|
compare_to: 'development'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
|
@ -41,17 +41,17 @@ Docker.Hub.Branch.Publish:
|
|||||||
$CI_COMMIT_BRANCH == "master" &&
|
$CI_COMMIT_BRANCH == "master" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
- if: # condition_dev_branch_push
|
- if: # condition_dev_branch_push
|
||||||
$CI_COMMIT_BRANCH == "development" &&
|
$CI_COMMIT_BRANCH == "development" &&
|
||||||
$CI_PIPELINE_SOURCE == "push"
|
$CI_PIPELINE_SOURCE == "push"
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
changes:
|
changes:
|
||||||
paths:
|
paths:
|
||||||
- '{dockerfile, dockerfile.j2, includes**/**}'
|
- '{dockerfile,dockerfile.j2,includes**/**}'
|
||||||
compare_to: 'master'
|
compare_to: 'master'
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
when: manual
|
when: manual
|
||||||
@ -68,7 +68,7 @@ Docker.Hub.Tag.Publish:
|
|||||||
$CI_COMMIT_TAG != null &&
|
$CI_COMMIT_TAG != null &&
|
||||||
$CI_COMMIT_BRANCH == null
|
$CI_COMMIT_BRANCH == null
|
||||||
exists:
|
exists:
|
||||||
- '{dockerfile, dockerfile.j2}'
|
- '{dockerfile,dockerfile.j2}'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
- when: never
|
- when: never
|
||||||
|
Reference in New Issue
Block a user