diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb5104ee6..dc0ea8311 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,10 +60,8 @@ build_16_5: # make sure any previously merged jars are removed before running this job. # note: if the merged folder doesn't exist "rm -R Merged" will throw an error, which can be ignored # the "|| true" makes that step always succeed. - - rm -R Merged || true; - - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/; - - ./gradlew merge --gradle-user-home cache/; - ./gradlew test --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/; # build using Java 16 image: eclipse-temurin:16 artifacts: @@ -86,10 +84,8 @@ build_16_5: build_17_1: stage: build_17_1 script: - - rm -R Merged || true; - - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/; - - ./gradlew merge --gradle-user-home cache/; - ./gradlew test --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/; image: eclipse-temurin:16 artifacts: name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" @@ -108,11 +104,9 @@ build_17_1: # 1.18.1 build build_18_1: stage: build_18_1 - script: - - rm -R Merged || true; - - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/; - - ./gradlew merge --gradle-user-home cache/; + script: - ./gradlew test --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/; # build using Java 17 image: eclipse-temurin:17 artifacts: @@ -133,10 +127,8 @@ build_18_1: build_18_2: stage: build_18_2 script: - - rm -R Merged || true; - - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/; - - ./gradlew merge --gradle-user-home cache/; - ./gradlew test --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" @@ -156,10 +148,8 @@ build_18_2: build_19: stage: build_19 script: - - rm -R Merged || true; - - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/; - - ./gradlew merge --gradle-user-home cache/; - ./gradlew test --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"