From e75464c7c409fd17864624d48c9fec8e6e3544e9 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 7 Jun 2023 15:40:24 +0930 Subject: [PATCH 1/3] feat(sync): immediatee git sync !55 --- template/automagic.gitlab-ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/automagic.gitlab-ci.yaml b/template/automagic.gitlab-ci.yaml index 2ad41c2..1bc2599 100644 --- a/template/automagic.gitlab-ci.yaml +++ b/template/automagic.gitlab-ci.yaml @@ -47,3 +47,4 @@ Gitlab Release: Github (Push --mirror): extends: - .git_push_mirror + needs: [] From 0ec520f02328b69642f929a19e8517c7d475a988 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 7 Jun 2023 16:50:45 +0930 Subject: [PATCH 2/3] feat(ci): add resource groups !55 fixes #33 --- template/ansible-role.gitlab-ci.yaml | 1 + template/docker-image.gitlab-ci.yaml | 4 +++- template/mkdocs-documentation.gitlab-ci.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/template/ansible-role.gitlab-ci.yaml b/template/ansible-role.gitlab-ci.yaml index bbb5709..99178cf 100644 --- a/template/ansible-role.gitlab-ci.yaml +++ b/template/ansible-role.gitlab-ci.yaml @@ -15,6 +15,7 @@ Ansible Lint (python 3.11): extends: - .ansible_linter_defaults image: python:3.11-slim + resource_group: build Gitlab Release: diff --git a/template/docker-image.gitlab-ci.yaml b/template/docker-image.gitlab-ci.yaml index 98afc62..1c5f986 100644 --- a/template/docker-image.gitlab-ci.yaml +++ b/template/docker-image.gitlab-ci.yaml @@ -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 diff --git a/template/mkdocs-documentation.gitlab-ci.yaml b/template/mkdocs-documentation.gitlab-ci.yaml index 01ec5b7..d3042f2 100644 --- a/template/mkdocs-documentation.gitlab-ci.yaml +++ b/template/mkdocs-documentation.gitlab-ci.yaml @@ -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: From 46d85bcf49ea73545a5af4324c28af51a17acd3c Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 8 Jun 2023 12:04:19 +0930 Subject: [PATCH 3/3] fix(ansible_lint): enable first level dir paths !55 --- lint/ansible.gitlab-ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lint/ansible.gitlab-ci.yaml b/lint/ansible.gitlab-ci.yaml index b671395..1f0681c 100644 --- a/lint/ansible.gitlab-ci.yaml +++ b/lint/ansible.gitlab-ci.yaml @@ -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