infrastructure/gitlab-ci
2
0
Fork 0
Code Issues 17 Pull Requests 1 Actions Projects Releases 21 Wiki Activity

Merge branch 'fix-non-urgent' into 'development'

Browse Source 
fix: non urgent

See merge request nofusscomputing/projects/gitlab-ci!50
This commit is contained in:
Jon Lockwood
2023-06-05 02:33:04 +00:00
parent 6201afaf7e 6a149f6ed6
commit 1e21ff2709
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -26,7 +26,7 @@ include:
variables:
JOB_ROOT_DIR: '.'
SECURE_LOG_LEVEL: debug
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_STRATEGY: normal
GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/gitlab-ci.git"
MY_PROJECT_ID: "28543717"
LICENSE_FINDER_CLI_OPTS: '--recursive'

2
.gitlab-ci_common.yaml
View File

@ -1,6 +1,6 @@
variables:
JOB_ROOT_DIR: 'gitlab-ci'
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_STRATEGY: normal
#PIPELINE_RUN_TRIGGER: 'false'
PIPELINE_RUN_SCHEDULE: 'true'

4
docker/build.gitlab-ci.yaml
View File

@ -111,7 +111,7 @@ variables:
- '{dockerfile, dockerfile.j2}'
changes:
paths:
- '{dockerfile, dockerfile.j2, includes**/**}'
- '{dockerfile, dockerfile.j2, includes/**}'
compare_to: 'master'
when: always
@ -123,7 +123,7 @@ variables:
- '{dockerfile, dockerfile.j2}'
changes:
paths:
- '{dockerfile, dockerfile.j2, includes**/**}'
- '{dockerfile, dockerfile.j2, includes/**}'
compare_to: 'development'
when: always

2
docker/publish.gitlab-ci.yaml
View File

@ -116,7 +116,7 @@
- '{dockerfile, dockerfile.j2}'
changes:
paths:
- '{dockerfile, dockerfile.j2, includes**/**}'
- '{dockerfile, dockerfile.j2, includes/**}'
compare_to: 'master'
allow_failure: true
when: manual

7
gitlab_release/.gitlab-ci.yml
View File

@ -112,9 +112,14 @@ commit footer refs:
- if: # condition_not_master_or_dev_push
$CI_COMMIT_BRANCH != "master" &&
$CI_COMMIT_BRANCH != "development" &&
$CI_PIPELINE_SOURCE == "push"
$CI_PIPELINE_SOURCE == "push" &&
$CI_COMMIT_TAG == null
exists:
- .cz.yaml
changes:
paths:
- "**/**"
compare_to: development
when: always
- when: never

10
lint/ansible.gitlab-ci.yaml
View File

@ -41,17 +41,17 @@
$CI_COMMIT_BRANCH == "master" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
when: always
- if: # condition_dev_branch_push
$CI_COMMIT_BRANCH == "development" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
changes:
paths:
- '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
compare_to: 'master'
when: always
@ -60,10 +60,10 @@
$CI_COMMIT_BRANCH != "development" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
changes:
paths:
- '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
compare_to: 'development'
when: always