From 821e86b8755196d317f1547c8024053f3e5f1d06 Mon Sep 17 00:00:00 2001
From: coolGi2007 <sasanaps@hotmail.com>
Date: Sun, 3 Apr 2022 19:48:44 +0930
Subject: [PATCH] Updated the CD (now should work)

---
 .gitlab-ci.yml | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3f3f1b80..d8e0e8483 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-  - build_18_1
   - build_18_2
+  - build_18_1
   - build_17_1
 
 variables:
@@ -18,6 +18,27 @@ before_script:
     - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
 
 
+
+# 1.17.1 build
+build_17_1:
+  stage: build_17_1
+  script:
+    - ./gradlew deleteMerged --gradle-user-home cache/;
+    - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
+    - ./gradlew merge --gradle-user-home cache/;
+  image: eclipse-temurin:16
+  artifacts:
+    name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - Merged
+    expire_in: 1 day
+  cache:
+    key: "gradleCache"
+    policy: pull-push
+    paths:
+      - .gradle
+      - cache/
+
 # 1.18.1 build 
 build_18_1:
     stage: build_18_1
@@ -60,26 +81,6 @@ build_18_2:
       - .gradle
       - cache/
 
-# 1.17.1 build
-build_17_1:
-  stage: build_17_1
-  script:
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
-  image: eclipse-temurin:16
-  artifacts:
-    name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged
-    expire_in: 1 day
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-
 
 # unused deployment stage
 #deploy: