Front-port the ci fixes by magneticflux for now

This commit is contained in:
TomTheFurry
2022-06-23 22:56:26 +08:00
parent 6769702d45
commit fd5fd05622
+11 -6
View File
@@ -28,8 +28,9 @@ 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/;
- rm -R Merged || true;
- ./gradlew deleteMerged --gradle-user-home cache/;
- ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/;
- ./gradlew merge --gradle-user-home cache/;
- ./gradlew test --gradle-user-home cache/;
# build using Java 16
@@ -55,7 +56,8 @@ build_17_1:
stage: build_17_1
script:
- rm -R Merged || true;
- ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
- ./gradlew deleteMerged --gradle-user-home cache/;
- ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
- ./gradlew merge --gradle-user-home cache/;
- ./gradlew test --gradle-user-home cache/;
image: eclipse-temurin:16
@@ -78,7 +80,8 @@ build_18_1:
stage: build_18_1
script:
- rm -R Merged || true;
- ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/;
- ./gradlew deleteMerged --gradle-user-home cache/;
- ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/;
- ./gradlew merge --gradle-user-home cache/;
- ./gradlew test --gradle-user-home cache/;
# build using Java 17
@@ -102,7 +105,8 @@ build_18_2:
stage: build_18_2
script:
- rm -R Merged || true;
- ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/;
- ./gradlew deleteMerged --gradle-user-home cache/;
- ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
- ./gradlew merge --gradle-user-home cache/;
- ./gradlew test --gradle-user-home cache/;
image: eclipse-temurin:17
@@ -125,8 +129,9 @@ build_19:
stage: build_19
script:
- ./gradlew deleteMerged --gradle-user-home cache/;
- ./gradlew build -PmcVer=1.19 --gradle-user-home cache/;
- ./gradlew build -PmcVer="1.19" --gradle-user-home cache/;
- ./gradlew merge --gradle-user-home cache/;
- ./gradlew test --gradle-user-home cache/;
image: eclipse-temurin:17
artifacts:
name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"