Merge branch 'restructure' into 'development'

fix: gitlab release

See merge request nofusscomputing/projects/gitlab-ci!22

.cz.yaml

@@ -2,6 +2,6 @@ commitizen:
   bump_message: "build(version): bump version $current_version \u2192 $new_version"
   changelog_incremental: false
   name: cz_conventional_commits
-  tag_format: v$major.$minor.$patch$prerelease
+  tag_format: $major.$minor.$patch$prerelease
   update_changelog_on_bump: true
   version: 0.6.1rc0

.gitlab-ci.yml

@@ -19,7 +19,7 @@ include:
   - local: $JOB_ROOT_DIR/validation/.gitlab-ci.yml
   - local: $JOB_ROOT_DIR/python/.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/License-Scanning.gitlab-ci.yml
+  #- template: Security/License-Scanning.gitlab-ci.yml
 
 # Scanner doesn't Pickup multiple pip files. Disable and specify jobs with pip file.
 gemnasium-python-dependency_scanning:

conventional_commits/.gitlab-ci.yml

@@ -49,7 +49,9 @@
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
     - if: '$CI_COMMIT_TAG'
-      when: always
+      when: never
+    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+      when: never
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: always
     - if: '$CI_COMMIT_BRANCH'

type/docker-image.gitlab-ci.yaml

@@ -37,6 +37,8 @@ variables:
     # See https://github.com/docker-library/docker/pull/166
     DOCKER_TLS_CERTDIR: ""
   before_script:
+    - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi
+    - echo "[DEBUG] ROOT_DIR[$ROOT_DIR]"
     - docker info
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     #- pip3 install -r gitlab-ci/gitlab_release/requirements.txt