Merge branch 'genesis' into 'development'

fix(ci): ensure docker build and publish occurs

See merge request nofusscomputing/projects/ansible/collections/phpipam_scan_agent!3
This commit is contained in:
2024-02-21 07:36:07 +00:00

View File

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