From 20726d1712b6bf26838929b2a1717cf5617de676 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 17 Jun 2024 15:59:11 +0930 Subject: [PATCH] feat(project): add django itsm docs !62 nofusscomputing/projects/django_template!27 --- .gitlab-ci.yml | 4 ++++ .gitlab/project_docs.gitlab-ci.yml | 12 ++++++++++-- mkdocs.yml | 4 ++++ pages/projects/django-template/index.md | 0 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pages/projects/django-template/index.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc4a97d..848ecba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,10 @@ Get Project Documentation: ASSEMBLE_PROJECT_ID: 51640016 ASSEMBLE_PROJECT_PATH: projects/ansible/collection/firewall + - ASSEMBLE_PROJECT_NAME: django_template + ASSEMBLE_PROJECT_ID: 57560288 + ASSEMBLE_PROJECT_PATH: projects/django-template + - ASSEMBLE_PROJECT_NAME: kubernetes ASSEMBLE_PROJECT_ID: 51640029 ASSEMBLE_PROJECT_PATH: projects/ansible/collection/kubernetes diff --git a/.gitlab/project_docs.gitlab-ci.yml b/.gitlab/project_docs.gitlab-ci.yml index 2d41dd0..22c9b63 100644 --- a/.gitlab/project_docs.gitlab-ci.yml +++ b/.gitlab/project_docs.gitlab-ci.yml @@ -57,7 +57,11 @@ ) || ( - $CI_COMMIT_BRANCH == "development" + ( + $CI_COMMIT_BRANCH == "development" + || + $CI_COMMIT_BRANCH != "master" + ) && ( $CI_PIPELINE_SOURCE == "pipeline" @@ -131,7 +135,11 @@ ) || ( - $CI_COMMIT_BRANCH == "development" + ( + $CI_COMMIT_BRANCH == "development" + || + $CI_COMMIT_BRANCH != "master" + ) && ( $CI_PIPELINE_SOURCE == "pipeline" diff --git a/mkdocs.yml b/mkdocs.yml index 0a93db9..e943f51 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -97,6 +97,10 @@ nav: - projects/docker-mail/index.md + - Django ITSM: + + - projects/django-template/index.md + - Gitlab CI: projects/gitlab-ci/index.md - ITIL: diff --git a/pages/projects/django-template/index.md b/pages/projects/django-template/index.md new file mode 100644 index 0000000..e69de29