From 4a82c7ab8721cc047d37307838e15899cc373647 Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Tue, 6 Jul 2021 14:24:10 +0200 Subject: [PATCH] chore(CI) Rename Templates to work with Renovate --- .gitlab-ci.yml | 23 ------------------- ...ml => STD-variablen-Template.gitlab-ci.yml | 0 ...ish.yml => container-publish.gitlab-ci.yml | 0 ...r-scan.yml => container-scan.gitlab-ci.yml | 0 .../chapters/generalInformation.adoc | 20 ++++++++-------- .../chapters/templates/container-publish.adoc | 2 +- .../chapters/templates/container-scan.adoc | 2 +- .../templates/maven-build-template.adoc | 2 +- .../maven-dependencies-template.adoc | 2 +- .../templates/maven-verify-template.adoc | 2 +- .../templates/npm-build-template.adoc | 2 +- .../templates/npm-dependencies-template.adoc | 2 +- .../chapters/templates/npm-lint-template.adoc | 2 +- .../chapters/templates/npm-test-template.adoc | 2 +- ....yml => maven-build-template.gitlab-ci.yml | 0 ... maven-dependencies-template.gitlab-ci.yml | 0 ...yml => maven-verify-template.gitlab-ci.yml | 0 ...te.yml => npm-build-template.gitlab-ci.yml | 0 ...=> npm-dependencies-template.gitlab-ci.yml | 0 ...ate.yml => npm-lint-template.gitlab-ci.yml | 0 ...ate.yml => npm-test-template.gitlab-ci.yml | 0 21 files changed, 19 insertions(+), 42 deletions(-) rename STD-variablen-Template.yml => STD-variablen-Template.gitlab-ci.yml (100%) rename container-publish.yml => container-publish.gitlab-ci.yml (100%) rename container-scan.yml => container-scan.gitlab-ci.yml (100%) rename maven-build-template.yml => maven-build-template.gitlab-ci.yml (100%) rename maven-dependencies-template.yml => maven-dependencies-template.gitlab-ci.yml (100%) rename maven-verify-template.yml => maven-verify-template.gitlab-ci.yml (100%) rename npm-build-template.yml => npm-build-template.gitlab-ci.yml (100%) rename npm-dependencies-template.yml => npm-dependencies-template.gitlab-ci.yml (100%) rename npm-lint-template.yml => npm-lint-template.gitlab-ci.yml (100%) rename npm-test-template.yml => npm-test-template.gitlab-ci.yml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85bac0f..855a82d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,29 +2,6 @@ stages: - dependencies - generate-docs -.renovate: - variables: - RENOVATE_GIT_AUTHOR: "${GITLAB_USER_NAME} <${GITLAB_USER_EMAIL}>" - RENOVATE_DRY_RUN: "false" - image: - name: renovate/renovate - entrypoint: [ "" ] - stage: dependencies - script: - - > - renovate - --platform "gitlab" - --endpoint "${CI_API_V4_URL}" - --git-author "${RENOVATE_GIT_AUTHOR}" - --dry-run "${RENOVATE_DRY_RUN}" - "${CI_PROJECT_PATH}" - only: - - feat/renovate_test - - schedules - -Renovate: - extends: .renovate - .generate-document: image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-documentation-tool:latest stage: generate-docs diff --git a/STD-variablen-Template.yml b/STD-variablen-Template.gitlab-ci.yml similarity index 100% rename from STD-variablen-Template.yml rename to STD-variablen-Template.gitlab-ci.yml diff --git a/container-publish.yml b/container-publish.gitlab-ci.yml similarity index 100% rename from container-publish.yml rename to container-publish.gitlab-ci.yml diff --git a/container-scan.yml b/container-scan.gitlab-ci.yml similarity index 100% rename from container-scan.yml rename to container-scan.gitlab-ci.yml diff --git a/documentation/chapters/generalInformation.adoc b/documentation/chapters/generalInformation.adoc index 24fb4c7..bd14a70 100644 --- a/documentation/chapters/generalInformation.adoc +++ b/documentation/chapters/generalInformation.adoc @@ -16,15 +16,15 @@ include: - project: 'gilden/ci/gitlab-ci-templates' ref: 'master' file: - - 'maven-build-template.yml' - - 'maven-dependencies-template.yml' - - 'maven-verify-template.yml' - - 'npm-build-template.yml' - - 'npm-dependencies-template.yml' - - 'npm-lint-template.yml' - - 'npm-test-template.yml' - - 'container-publish.yml' - - 'container-scan.yml' + - 'maven-build-template.gitlab-ci.yml' + - 'maven-dependencies-template.gitlab-ci.yml' + - 'maven-verify-template.gitlab-ci.yml' + - 'npm-build-template.gitlab-ci.yml' + - 'npm-dependencies-template.gitlab-ci.yml' + - 'npm-lint-template.gitlab-ci.yml' + - 'npm-test-template.gitlab-ci.yml' + - 'container-publish.gitlab-ci.yml' + - 'container-scan.gitlab-ci.yml' - 'set-version-template.yml' - 'sonar-template.yml' @@ -56,5 +56,5 @@ Bitte folgende Variablen in `.gitlab-ci.yaml` setzen |=== ---- -include::{sourcedir}/STD-variablen-Template.yml[] +include::{sourcedir}/STD-variablen-Template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/container-publish.adoc b/documentation/chapters/templates/container-publish.adoc index c90abce..d8ffbdf 100644 --- a/documentation/chapters/templates/container-publish.adoc +++ b/documentation/chapters/templates/container-publish.adoc @@ -14,5 +14,5 @@ Falls das Projekt aus mehreren Poms besteht, kann `before_script:` benutzt werde .sonar-template ---- -include::{sourcedir}/container-publish.yml[] +include::{sourcedir}/container-publish.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/container-scan.adoc b/documentation/chapters/templates/container-scan.adoc index 2dc3a1d..cb5efa8 100644 --- a/documentation/chapters/templates/container-scan.adoc +++ b/documentation/chapters/templates/container-scan.adoc @@ -18,5 +18,5 @@ Benutzte `allow_failure: true` damit die CI weiter läuft aber ein Failure angez .sonar-template ---- -include::{sourcedir}/container-scan.yml[] +include::{sourcedir}/container-scan.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/maven-build-template.adoc b/documentation/chapters/templates/maven-build-template.adoc index 1db46ab..42f4eb4 100644 --- a/documentation/chapters/templates/maven-build-template.adoc +++ b/documentation/chapters/templates/maven-build-template.adoc @@ -11,5 +11,5 @@ Diese Template Baut die .jar Files und speichert die Ergebnisse als Artifact. .mvn-build-template ---- -include::{sourcedir}/maven-build-template.yml[] +include::{sourcedir}/maven-build-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/maven-dependencies-template.adoc b/documentation/chapters/templates/maven-dependencies-template.adoc index ab8a4a3..2d85373 100644 --- a/documentation/chapters/templates/maven-dependencies-template.adoc +++ b/documentation/chapters/templates/maven-dependencies-template.adoc @@ -12,5 +12,5 @@ Bitte den Cache hinzufügen. Siehe xref:Generel-Veriablen[Generelle Veriablen] .mvn-dependencies-template ---- -include::{sourcedir}/maven-dependencies-template.yml[] +include::{sourcedir}/maven-dependencies-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/maven-verify-template.adoc b/documentation/chapters/templates/maven-verify-template.adoc index 4852abf..6757312 100644 --- a/documentation/chapters/templates/maven-verify-template.adoc +++ b/documentation/chapters/templates/maven-verify-template.adoc @@ -11,5 +11,5 @@ Dieses Template startet `mvn verify` und speichert die Ergebnisse als Artifact. .mvn-verify-template ---- -include::{sourcedir}/maven-verify-template.yml[] +include::{sourcedir}/maven-verify-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/npm-build-template.adoc b/documentation/chapters/templates/npm-build-template.adoc index 836bd49..8b99c39 100644 --- a/documentation/chapters/templates/npm-build-template.adoc +++ b/documentation/chapters/templates/npm-build-template.adoc @@ -11,5 +11,5 @@ Dieses Template baut das NPM projekt und speichert die Ergebnisse als Artifact.. .npm-build-template ---- -include::{sourcedir}/npm-build-template.yml[] +include::{sourcedir}/npm-build-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/npm-dependencies-template.adoc b/documentation/chapters/templates/npm-dependencies-template.adoc index 340006d..7621486 100644 --- a/documentation/chapters/templates/npm-dependencies-template.adoc +++ b/documentation/chapters/templates/npm-dependencies-template.adoc @@ -12,5 +12,5 @@ Bitte den Cache hinzufügen. Siehe xref:Generel-Veriablen[Generelle Veriablen] .npm-dependencies-template ---- -include::{sourcedir}/npm-dependencies-template.yml[] +include::{sourcedir}/npm-dependencies-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/npm-lint-template.adoc b/documentation/chapters/templates/npm-lint-template.adoc index 8f89e87..1c3116c 100644 --- a/documentation/chapters/templates/npm-lint-template.adoc +++ b/documentation/chapters/templates/npm-lint-template.adoc @@ -11,5 +11,5 @@ Dieses Template durchläuft den Linter das NPM projekts. .npm-lint-template ---- -include::{sourcedir}/npm-lint-template.yml[] +include::{sourcedir}/npm-lint-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/npm-test-template.adoc b/documentation/chapters/templates/npm-test-template.adoc index 109a82b..8b4c8f5 100644 --- a/documentation/chapters/templates/npm-test-template.adoc +++ b/documentation/chapters/templates/npm-test-template.adoc @@ -11,5 +11,5 @@ Dieses Template baut das NPM projekt. .npm-test-template ---- -include::{sourcedir}/npm-test-template.yml[] +include::{sourcedir}/npm-test-template.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/maven-build-template.yml b/maven-build-template.gitlab-ci.yml similarity index 100% rename from maven-build-template.yml rename to maven-build-template.gitlab-ci.yml diff --git a/maven-dependencies-template.yml b/maven-dependencies-template.gitlab-ci.yml similarity index 100% rename from maven-dependencies-template.yml rename to maven-dependencies-template.gitlab-ci.yml diff --git a/maven-verify-template.yml b/maven-verify-template.gitlab-ci.yml similarity index 100% rename from maven-verify-template.yml rename to maven-verify-template.gitlab-ci.yml diff --git a/npm-build-template.yml b/npm-build-template.gitlab-ci.yml similarity index 100% rename from npm-build-template.yml rename to npm-build-template.gitlab-ci.yml diff --git a/npm-dependencies-template.yml b/npm-dependencies-template.gitlab-ci.yml similarity index 100% rename from npm-dependencies-template.yml rename to npm-dependencies-template.gitlab-ci.yml diff --git a/npm-lint-template.yml b/npm-lint-template.gitlab-ci.yml similarity index 100% rename from npm-lint-template.yml rename to npm-lint-template.gitlab-ci.yml diff --git a/npm-test-template.yml b/npm-test-template.gitlab-ci.yml similarity index 100% rename from npm-test-template.yml rename to npm-test-template.gitlab-ci.yml