diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 335097d45..de9147df8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ before_script: build_16_5: stage: build_16_5 script: - - ./gradlew deleteMerged --gradle-user-home cache/; + - rm -R Merged; - ./gradlew build -PmcVer=1.16.5 --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:16 @@ -46,7 +46,7 @@ build_16_5: build_17_1: stage: build_17_1 script: - - ./gradlew deleteMerged --gradle-user-home cache/; + - rm -R Merged; - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:16 @@ -69,7 +69,7 @@ build_17_1: build_18_1: stage: build_18_1 script: - - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job + - rm -R Merged; # make sure any previously merged jars are removed before running this job - ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; # build using Java 17 @@ -93,7 +93,7 @@ build_18_1: build_18_2: stage: build_18_2 script: - - ./gradlew deleteMerged --gradle-user-home cache/; + - rm -R Merged; - ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:17 diff --git a/build.gradle b/build.gradle index 279197cff..f0d8b9951 100644 --- a/build.gradle +++ b/build.gradle @@ -364,10 +364,3 @@ allprojects { p -> runServer.enabled = false } } - - -// this deletes the merged folder so we don't carry over -// the previous merges to each new build job in the CI/CD pipeline -task deleteMerged(type: Delete) { - delete files("./Merged") -}