From ba75e97d0656e80912a2d99bea36cd89d3de2c4c Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Wed, 6 Jul 2022 09:07:00 +0200 Subject: [PATCH] chore(*): Move cd $Backend into script to free up before_script for user --- templates/java/gradle/gradle-database-diff.gitlab-ci.yml | 3 +-- templates/java/gradle/gradle-license.gitlab-ci.yml | 3 +-- templates/java/gradle/gradle-verify.gitlab-ci.yml | 3 +-- templates/java/maven/maven-database-diff.gitlab-ci.yml | 3 +-- templates/java/maven/maven-dependencies.gitlab-ci.yml | 3 +-- templates/java/maven/maven-license.gitlab-ci.yml | 3 +-- templates/java/maven/maven-verify.gitlab-ci.yml | 3 +-- templates/static-analysis/sonar-7.gitlab-ci.yml | 8 +++----- templates/static-analysis/sonar-8.gitlab-ci.yml | 6 ++---- 9 files changed, 12 insertions(+), 23 deletions(-) diff --git a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml index cf26db7..ba578f9 100644 --- a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml +++ b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml @@ -8,11 +8,10 @@ include: variables: GRADLE_EXTRA_OPTS: "" PATH_TO_DIFF: "build/db-diff.xml" - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS diff --git a/templates/java/gradle/gradle-license.gitlab-ci.yml b/templates/java/gradle/gradle-license.gitlab-ci.yml index 497134f..2f324e9 100644 --- a/templates/java/gradle/gradle-license.gitlab-ci.yml +++ b/templates/java/gradle/gradle-license.gitlab-ci.yml @@ -1,12 +1,11 @@ .gradle-licence-bom: image: $GRADLE_IMAGE stage: build - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS" needs: [] artifacts: diff --git a/templates/java/gradle/gradle-verify.gitlab-ci.yml b/templates/java/gradle/gradle-verify.gitlab-ci.yml index 93efc59..29abf58 100644 --- a/templates/java/gradle/gradle-verify.gitlab-ci.yml +++ b/templates/java/gradle/gradle-verify.gitlab-ci.yml @@ -1,12 +1,11 @@ .gradle-verify: image: $GRADLE_IMAGE stage: verify - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - "./gradlew --build-cache test $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS" artifacts: expire_in: 2 weeks diff --git a/templates/java/maven/maven-database-diff.gitlab-ci.yml b/templates/java/maven/maven-database-diff.gitlab-ci.yml index 4644a24..683e3d5 100644 --- a/templates/java/maven/maven-database-diff.gitlab-ci.yml +++ b/templates/java/maven/maven-database-diff.gitlab-ci.yml @@ -8,12 +8,11 @@ include: variables: MAVEN_EXTRA_OPTS: "" PATH_TO_DIFF: "target/db-diff.xml" - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS compile liquibase:update liquibase:diff $MVN_EXTRA_ARGS artifacts: when: on_failure diff --git a/templates/java/maven/maven-dependencies.gitlab-ci.yml b/templates/java/maven/maven-dependencies.gitlab-ci.yml index 414da79..43068ce 100644 --- a/templates/java/maven/maven-dependencies.gitlab-ci.yml +++ b/templates/java/maven/maven-dependencies.gitlab-ci.yml @@ -1,10 +1,9 @@ .maven-dependencies: stage: dependencies image: $MAVEN_IMAGE - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS dependency:resolve $MVN_EXTRA_ARGS \ No newline at end of file diff --git a/templates/java/maven/maven-license.gitlab-ci.yml b/templates/java/maven/maven-license.gitlab-ci.yml index f8c1b64..c0019ad 100644 --- a/templates/java/maven/maven-license.gitlab-ci.yml +++ b/templates/java/maven/maven-license.gitlab-ci.yml @@ -1,12 +1,11 @@ .maven-licence-bom: image: $MAVEN_IMAGE stage: build - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS cyclonedx:makeBom $MVN_EXTRA_ARGS artifacts: when: always diff --git a/templates/java/maven/maven-verify.gitlab-ci.yml b/templates/java/maven/maven-verify.gitlab-ci.yml index 029102c..d6178f5 100644 --- a/templates/java/maven/maven-verify.gitlab-ci.yml +++ b/templates/java/maven/maven-verify.gitlab-ci.yml @@ -1,12 +1,11 @@ .maven-verify: image: $MAVEN_IMAGE stage: verify - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS verify $MVN_EXTRA_ARGS artifacts: expire_in: 2 weeks diff --git a/templates/static-analysis/sonar-7.gitlab-ci.yml b/templates/static-analysis/sonar-7.gitlab-ci.yml index 1564dd0..a6e87da 100644 --- a/templates/static-analysis/sonar-7.gitlab-ci.yml +++ b/templates/static-analysis/sonar-7.gitlab-ci.yml @@ -12,12 +12,11 @@ .sonar-maven: extends: .sonar-template-common image: $MAVEN_IMAGE - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS "-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.login=$SONAR_TOKEN" @@ -31,13 +30,12 @@ .sonar-gradle: extends: .sonar-template-common image: $GRADLE_IMAGE - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - - ./gradlew $GRADLE_OPTS $GRADLE_CLI_OPTS sonarqube + - ./gradlew $GRADLE_OPTS sonarqube $GRADLE_CLI_OPTS "-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.login=$SONAR_TOKEN" "-Dsonar.projectKey=$SONAR_PROJECT_KEY" diff --git a/templates/static-analysis/sonar-8.gitlab-ci.yml b/templates/static-analysis/sonar-8.gitlab-ci.yml index f007bea..6758942 100644 --- a/templates/static-analysis/sonar-8.gitlab-ci.yml +++ b/templates/static-analysis/sonar-8.gitlab-ci.yml @@ -11,12 +11,11 @@ .sonar-maven: extends: .sonar-template-common image: $MAVEN_IMAGE - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS "-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.login=$SONAR_TOKEN" @@ -29,12 +28,11 @@ .sonar-gradle: extends: .sonar-template-common image: $GRADLE_IMAGE - before_script: + script: - > if [ "$BACKEND_DIR" != "" ]; then cd $BACKEND_DIR fi - script: - ./gradlew $GRADLE_OPTS sonarqube $GRADLE_CLI_OPTS "-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.login=$SONAR_TOKEN"