From e242893a929c5a2c68b864eb97a31b7b1b7f149b Mon Sep 17 00:00:00 2001 From: coolGi Date: Wed, 15 Mar 2023 21:50:00 +1030 Subject: [PATCH] Fixed up CI --- .gitlab-ci.yml | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce93ba762..81ae43ea0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ image: gradle:eclipse-temurin # all stages need to be defined here stages: + - build_19_3 + - build_19_2 - build_19_1 - build_19 - build_18_2 @@ -162,7 +164,82 @@ build_19_1: - ./gradlew mergeJars -PmcVer="1.19.1" --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: - name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + name: "Merged_NightlyBuild_1_19_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + paths: + - Merged + expire_in: 1 day + when: always + cache: + key: "gradleCache" + policy: pull-push + paths: + - .gradle + - cache/ + allow_failure: true + +# 1.19.2 build +build_19_2: + stage: build_19_2 + script: + - echo "Building 1.19.2..." + - ./gradlew deleteMerged -PmcVer="1.19.2" --gradle-user-home cache/; + - ./gradlew clean -PmcVer="1.19.2" --gradle-user-home cache/; + - ./gradlew core:build -PmcVer="1.19.2" --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19.2" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.19.2" --gradle-user-home cache/; + image: eclipse-temurin:17 + artifacts: + name: "Merged_NightlyBuild_1_19_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + paths: + - Merged + expire_in: 1 day + when: always + cache: + key: "gradleCache" + policy: pull-push + paths: + - .gradle + - cache/ + allow_failure: true + +# 1.19.3 build +build_19_3: + stage: build_19_3 + script: + - echo "Building 1.19.3..." + - ./gradlew deleteMerged -PmcVer="1.19.3" --gradle-user-home cache/; + - ./gradlew clean -PmcVer="1.19.3" --gradle-user-home cache/; + - ./gradlew core:build -PmcVer="1.19.3" --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19.3" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.19.3" --gradle-user-home cache/; + image: eclipse-temurin:17 + artifacts: + name: "Merged_NightlyBuild_1_19_3-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + paths: + - Merged + expire_in: 1 day + when: always + cache: + key: "gradleCache" + policy: pull-push + paths: + - .gradle + - cache/ + allow_failure: true + +# 1.19.4 build +build_19_4: + stage: build_19_4 + script: + - echo "Building 1.19.4..." + - ./gradlew deleteMerged -PmcVer="1.19.4" --gradle-user-home cache/; + - ./gradlew clean -PmcVer="1.19.4" --gradle-user-home cache/; + - ./gradlew core:build -PmcVer="1.19.4" --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19.4" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.19.4" --gradle-user-home cache/; + image: eclipse-temurin:17 + artifacts: + name: "Merged_NightlyBuild_1_19_4-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: - Merged expire_in: 1 day