ansible-collections/phpipam_scan_agent
2
0
Fork 0
Code Issues 10 Pull Requests Actions Projects Releases 7 Wiki Activity

Merge branch 'genesis' into 'development'

Browse Source 
fix(ci): ensure docker build and publish occurs

See merge request nofusscomputing/projects/ansible/collections/phpipam_scan_agent!3
This commit is contained in:
Jon Lockwood
2024-02-21 07:36:07 +00:00
parent b8e0c28bb6 d8e1c36459
commit 413c986a6d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@ -31,6 +31,11 @@ include:
- git_push_mirror/.gitlab-ci.yml - git_push_mirror/.gitlab-ci.yml
Github (Push --mirror):
extends:
- .git_push_mirror
needs: []
.build_docker_container: .build_docker_container:
stage: prepare stage: prepare
@ -208,8 +213,6 @@ Docker Container (dev):
when: never when: never
- if: - if:
$CI_COMMIT_BRANCH != "development"
&&
$CI_COMMIT_BRANCH != "master" $CI_COMMIT_BRANCH != "master"
&& &&
$CI_PIPELINE_SOURCE == "push" $CI_PIPELINE_SOURCE == "push"
@ -251,11 +254,11 @@ Docker Container:
- if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'" - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
when: never when: never
- if: # Occur on merge # - if: # Occur on merge
$CI_COMMIT_BRANCH == "development" # $CI_COMMIT_BRANCH == "development"
&& # &&
$CI_PIPELINE_SOURCE == "push" # $CI_PIPELINE_SOURCE == "push"
when: always # when: always
- when: never - when: never