From ec3bab3158cd8df873a8614bbf44d248e58d72b7 Mon Sep 17 00:00:00 2001 From: TomTheFurry Date: Thu, 7 Jul 2022 22:15:23 +0800 Subject: [PATCH] Make everyone use mergeJar + rework autobuild script --- .gitlab-ci.yml | 10 +++++----- winAutoBuild.bat | 32 +++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 221b8e991..cfba9a554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ build_16_5: - ./gradlew deleteMerged -PmcVer="1.16.5" --gradle-user-home cache/; - ./gradlew clean -PmcVer="1.16.5" - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/; - - ./gradlew merge -PmcVer="1.16.5" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.16.5" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: name: "Merged_NightlyBuild_1_16_5-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" @@ -53,7 +53,7 @@ build_17_1: - ./gradlew deleteMerged -PmcVer="1.17.1" --gradle-user-home cache/; - ./gradlew clean -PmcVer="1.17.1" - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/; - - ./gradlew merge -PmcVer="1.17.1" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.17.1" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" @@ -78,7 +78,7 @@ build_18_1: - ./gradlew deleteMerged -PmcVer="1.18.1" --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job - ./gradlew clean -PmcVer="1.18.1" - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/; - - ./gradlew merge -PmcVer="1.18.1" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.18.1" --gradle-user-home cache/; # build using Java 17 image: eclipse-temurin:17 artifacts: @@ -104,7 +104,7 @@ build_18_2: - ./gradlew deleteMerged -PmcVer="1.18.2" --gradle-user-home cache/; - ./gradlew clean -PmcVer="1.18.2" - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/; - - ./gradlew merge -PmcVer="1.18.2" --gradle-user-home cache/; + - ./gradlew mergeJars -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}" @@ -128,7 +128,7 @@ build_19: - ./gradlew deleteMerged -PmcVer="1.19" --gradle-user-home cache/; - ./gradlew clean -PmcVer="1.19" - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/; - - ./gradlew merge -PmcVer="1.19" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.19" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" diff --git a/winAutoBuild.bat b/winAutoBuild.bat index 89259cbe6..bb2ed159c 100644 --- a/winAutoBuild.bat +++ b/winAutoBuild.bat @@ -1,19 +1,17 @@ -call ./gradlew clean -PmcVer="1.16.5" --no-daemon -call ./gradlew build -PmcVer="1.16.5" --no-daemon -call ./gradlew merge -PmcVer="1.16.5" --no-daemon +@echo off -call ./gradlew clean -PmcVer="1.17.1" --no-daemon -call ./gradlew build -PmcVer="1.17.1" --no-daemon -call ./gradlew merge -PmcVer="1.17.1" --no-daemon +SETLOCAL +CALL :buildVersion "1.19" +CALL :buildVersion "1.18.2" +CALL :buildVersion "1.18.1" +CALL :buildVersion "1.17.1" +CALL :buildVersion "1.16.5" +EXIT /B %ERRORLEVEL% -call ./gradlew clean -PmcVer="1.18.1" --no-daemon -call ./gradlew build -PmcVer="1.18.1" --no-daemon -call ./gradlew merge -PmcVer="1.18.1" --no-daemon - -call ./gradlew clean -PmcVer="1.18.2" --no-daemon -call ./gradlew build -PmcVer="1.18.2" --no-daemon -call ./gradlew merge -PmcVer="1.18.2" --no-daemon - -call ./gradlew clean -PmcVer="1.19" --no-daemon -call ./gradlew build -PmcVer="1.19" --no-daemon -call ./gradlew merge -PmcVer="1.19" --no-daemon \ No newline at end of file +:buildVersion +@echo on +call ./gradlew.bat clean -PmcVer="%~1" --no-daemon +call ./gradlew.bat build -PmcVer="%~1" --no-daemon +call ./gradlew.bat mergeJars -PmcVer="%~1" --no-daemon +@echo off +EXIT /B 0