diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7c9b40..69dbdb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ Test-Java-Backend: - when: manual trigger: project: gilden/ci/java-backend-template - branch: "Templates2.0" + branch: "master" strategy: depend Test-Docker-compose: @@ -71,7 +71,7 @@ pages: .' FILE_INPUT: "index.html,107524048,CI Templates 2.0" rules: - - if: $CI_COMMIT_REF_NAME == 'Templates2.0' + - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH when: always diff --git a/pipelines/release/eXXcellent-release-Child.gitlab-ci.yml b/pipelines/release/eXXcellent-release-Child.gitlab-ci.yml index b336cb6..1287b8e 100644 --- a/pipelines/release/eXXcellent-release-Child.gitlab-ci.yml +++ b/pipelines/release/eXXcellent-release-Child.gitlab-ci.yml @@ -11,7 +11,6 @@ variables: increase-version: rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_REF_NAME == 'Templates2.0' - if: $CI_COMMIT_REF_NAME =~ /^RELEASE.*/ variables: TAG: "true" @@ -24,7 +23,6 @@ push-tag-and-branch: image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.4.0 rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_REF_NAME == 'Templates2.0' before_script: - setup-ssh - echo $VERSION diff --git a/templates/releasing/release.gitlab-ci.yml b/templates/releasing/release.gitlab-ci.yml index 9b88685..6aece64 100644 --- a/templates/releasing/release.gitlab-ci.yml +++ b/templates/releasing/release.gitlab-ci.yml @@ -18,8 +18,6 @@ when: never - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH when: manual - - if: $CI_COMMIT_REF_NAME == 'Templates2.0' - when: manual #Do not make releases available in TAG CIs - if: $CI_COMMIT_TAG when: never