diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af3947abebf59d8b691c1322ecc5f51d46f66e32..af9ac79926600e43eeb57f80d69b63684d34f243 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,11 @@ include: - ci-templates/default.yml - - ci-templates/build_unprotected.yml + - local: ci-templates/build.yml + rules: + - if: $CI_COMMIT_REF_PROTECTED == "true" + - local: ci-templates/build_unprotected.yml + rules: + - if: $CI_COMMIT_REF_PROTECTED != "true" maven_build: extends: .maven_build diff --git a/ci-templates/default.yml b/ci-templates/default.yml index ede18c0b7b4e90ee0183d4c8fde7a6aa89660d1e..8b0f900dba882ea5ead1fd1d46c52cc33e0b579d 100644 --- a/ci-templates/default.yml +++ b/ci-templates/default.yml @@ -5,7 +5,6 @@ stages: - post - security -# Default configuration for all jobs .default: variables: DEFAULT_VERSION: "1.2.0-SNAPSHOT" @@ -18,19 +17,3 @@ stages: else export APP_VERSION=$DEFAULT_VERSION fi - -# Configuration for jobs on protected branches -.default_protected: - extends: .default - rules: - - if: $CI_COMMIT_REF_PROTECTED == "true" - -# Configuration for jobs on unprotected branches -.default_unprotected: - # extends: .default - variables: - APP_VERSION: $CI_COMMIT_REF_NAME - rules: - - if: $CI_COMMIT_REF_PROTECTED != "true" - artifacts: - expire_in: 1 day