Merge branch 'fix-immediate' into 'development'
fix: immediate Closes #33 See merge request nofusscomputing/projects/gitlab-ci!55
This commit is contained in:
@ -41,17 +41,17 @@
|
||||
$CI_COMMIT_BRANCH == "master" &&
|
||||
$CI_PIPELINE_SOURCE == "push"
|
||||
exists:
|
||||
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, 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/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
changes:
|
||||
paths:
|
||||
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, 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/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
changes:
|
||||
paths:
|
||||
- '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
- '{defaults, handlers, inventory, meta, playbooks. tasks, defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
|
||||
compare_to: 'development'
|
||||
when: always
|
||||
|
||||
|
@ -15,6 +15,7 @@ Ansible Lint (python 3.11):
|
||||
extends:
|
||||
- .ansible_linter_defaults
|
||||
image: python:3.11-slim
|
||||
resource_group: build
|
||||
|
||||
|
||||
Gitlab Release:
|
||||
|
@ -47,3 +47,4 @@ Gitlab Release:
|
||||
Github (Push --mirror):
|
||||
extends:
|
||||
- .git_push_mirror
|
||||
needs: []
|
||||
|
@ -28,12 +28,13 @@ variables:
|
||||
|
||||
Docker Container:
|
||||
extends: .build_docker_container
|
||||
resource_group: build
|
||||
|
||||
|
||||
Docker.Hub.Branch.Publish:
|
||||
extends: .publish-docker-hub
|
||||
needs: [ "Docker Container" ]
|
||||
|
||||
resource_group: build
|
||||
rules: # rules manually synced from docker/publish.gitlab-ci.yaml removing git tag
|
||||
|
||||
- if: # condition_master_branch_push
|
||||
@ -60,6 +61,7 @@ Docker.Hub.Branch.Publish:
|
||||
|
||||
Docker.Hub.Tag.Publish:
|
||||
extends: .publish-docker-hub
|
||||
resource_group: build
|
||||
rules: # rules manually synced from docker/publish.gitlab-ci.yaml only keeping git tag
|
||||
|
||||
- if: # condition_git_tag
|
||||
|
@ -14,10 +14,12 @@ Documentation.Lint:
|
||||
Documentation.Build:
|
||||
extends: .MKDocs_Build_Docs
|
||||
needs: [ 'Documentation.Lint' ]
|
||||
resource_group: Documentation
|
||||
|
||||
# this name must always be called 'pages' so that gitlab pages work
|
||||
pages:
|
||||
stage: deploy
|
||||
resource_group: Documentation
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
script:
|
||||
|
Reference in New Issue
Block a user