From ddef3451729b9a18c5c41af0936d26934d2ba6a8 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 09:52:59 +0000
Subject: Possibly Fixed CircleCI

---
 .circleci/config.yml | 73 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 086d399b75..d78502431e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,51 +1,50 @@
-# Java Gradle CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-java/ for more details
-#
 version: 2
 jobs:
   build:
+    working_directory: ~/code
+    
     docker:
-      # specify the version you desire here
       - image: circleci/openjdk:8-jdk
       
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
-    working_directory: ~/repo
-
+      
     environment:
-      # Customize the JVM maximum heap limit
       JVM_OPTS: -Xmx3200m
-      TERM: dumb
-    
+      
+      
     steps:
       - checkout
-
-      # Download and cache dependencies
+      #https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
       - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "build.gradle" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run: gradle setupDecompWorkspace eclipse clean build test
-      # - run: gradle eclipse
-      # - run: gradle clean build
-      # - run: gradle dependencies
-
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          
+      - forge:
+          name: Setup Forge/MCP
+          command: wget https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
+          
+      - zip:
+          name: Setup Forge/MCP
+          command: unzip forge-1.7.10-10.13.4.1614-1.7.10-src.zip
+          
+      - eclipse:
+          name: Setup Forge/MCP
+          command: ./gradlew setupDecompWorkspace
+          
+      - clean:
+          name: Ugh...
+          command: ./gradlew eclipse
+          
+      - build:
+          name: Build GT++
+          command: ./gradlew build
+          
       - save_cache:
           paths:
             - ~/.gradle
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "build.gradle" }}
-        
-      # run tests!
-      - run: gradle test
-      # Build!
-      - run: gradle build
-
-
-
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+
+      - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ 
+          path: app/build/reports
+          destination: reports
+      - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
+          path: app/build/test-results
+      # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
-- 
cgit 


From 0ed9f2e43c5d4e2e06b3a1f7d1bb8449e5af83a8 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 09:56:01 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d78502431e..54890efa01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,27 +13,29 @@ jobs:
       
     steps:
       - checkout
+      
       #https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
+      
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
           
-      - forge:
-          name: Setup Forge/MCP
+      - run:
+          name: Download Forge
           command: wget https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
-      - zip:
-          name: Setup Forge/MCP
+      - run:
+          name: Unzip Forge
           command: unzip forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
-      - eclipse:
+      - run:
           name: Setup Forge/MCP
           command: ./gradlew setupDecompWorkspace
           
-      - clean:
+      - run:
           name: Ugh...
           command: ./gradlew eclipse
           
-      - build:
+      - run:
           name: Build GT++
           command: ./gradlew build
           
-- 
cgit 


From e23951a27cacd6e80f305602022a0e2c4638da75 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 09:58:52 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54890efa01..96bdee3615 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,8 +16,8 @@ jobs:
       
       #https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
       
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      #- restore_cache:
+      #    key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
           
       - run:
           name: Download Forge
@@ -25,7 +25,7 @@ jobs:
           
       - run:
           name: Unzip Forge
-          command: unzip forge-1.7.10-10.13.4.1614-1.7.10-src.zip
+          command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
       - run:
           name: Setup Forge/MCP
-- 
cgit 


From d2962d0caf27bca03d1a77a2976c652951ebf718 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 10:05:55 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 96bdee3615..2d8592f5a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,12 +27,16 @@ jobs:
           name: Unzip Forge
           command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
+      - run:
+          name: chmod Wrapper
+          command: chmod 777 /home/circleci/.gradle/wrapper/dists/gradle-2.0-bin/5h57m9vra0mjv9qs45oqtsb5c0/gradle-2.0/bin/gradle
+          
       - run:
           name: Setup Forge/MCP
           command: ./gradlew setupDecompWorkspace
           
       - run:
-          name: Ugh...
+          name: Eclipse Setup
           command: ./gradlew eclipse
           
       - run:
-- 
cgit 


From 6f00b07961404984293e84d45fec77dcfabef6b3 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 10:07:19 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d8592f5a2..fae9a3be4f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
           
       - run:
           name: chmod Wrapper
-          command: chmod 777 /home/circleci/.gradle/wrapper/dists/gradle-2.0-bin/5h57m9vra0mjv9qs45oqtsb5c0/gradle-2.0/bin/gradle
+          command: chmod 777 /home/circleci/.gradle/wrapper/dists/gradle-2.0-bin/
           
       - run:
           name: Setup Forge/MCP
-- 
cgit 


From 3944931c34a281b7711a257f985883086aaa4c6b Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 10:09:14 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fae9a3be4f..87e240b820 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,17 +27,13 @@ jobs:
           name: Unzip Forge
           command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
-      - run:
-          name: chmod Wrapper
-          command: chmod 777 /home/circleci/.gradle/wrapper/dists/gradle-2.0-bin/
-          
       - run:
           name: Setup Forge/MCP
-          command: ./gradlew setupDecompWorkspace
+          command: sudo chmod +x ./gradlew setupDecompWorkspace
           
       - run:
           name: Eclipse Setup
-          command: ./gradlew eclipse
+          command: sudo chmod +x ./gradlew eclipse
           
       - run:
           name: Build GT++
-- 
cgit 


From 6c07835ac951600a17fd9cd8684300c4a8d69e70 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 10:13:06 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 87e240b820..2134fb2be1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,13 +27,17 @@ jobs:
           name: Unzip Forge
           command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
           
+      - run:
+         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
+         command: sudo chmod +x ./gradlew
+         
       - run:
           name: Setup Forge/MCP
-          command: sudo chmod +x ./gradlew setupDecompWorkspace
+          command: ./gradlew setupDecompWorkspace
           
       - run:
           name: Eclipse Setup
-          command: sudo chmod +x ./gradlew eclipse
+          command: ./gradlew eclipse
           
       - run:
           name: Build GT++
-- 
cgit 


From ece2c30b997c900d82bdfd66594b624adcb62d3d Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 10:49:16 +0000
Subject: % Updated CircleCI config

> Attempt to use the Continuous Integration setup instead.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2134fb2be1..029af5643f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
          
       - run:
           name: Setup Forge/MCP
-          command: ./gradlew setupDecompWorkspace
+          command: ./gradlew SetupCIWorkspace
           
       - run:
           name: Eclipse Setup
-- 
cgit 


From ce73c88055ebd3e6e129fc41ab3fee47d21ccd9e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 11:02:38 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 029af5643f..fea0ea02a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 jobs:
   build:
-    working_directory: ~/code
+    working_directory: ~/repo
     
     docker:
       - image: circleci/openjdk:8-jdk
@@ -26,6 +26,10 @@ jobs:
       - run:
           name: Unzip Forge
           command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
+         
+      - run:
+          name: Dependencies
+          command: gradle dependencies
           
       - run:
          name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
@@ -33,15 +37,15 @@ jobs:
          
       - run:
           name: Setup Forge/MCP
-          command: ./gradlew SetupCIWorkspace
+          command: gradle SetupCIWorkspace
           
       - run:
           name: Eclipse Setup
-          command: ./gradlew eclipse
+          command: gradle eclipse
           
       - run:
           name: Build GT++
-          command: ./gradlew build
+          command: gradle build
           
       - save_cache:
           paths:
-- 
cgit 


From 5025c0c72230ce1f3359043e07c4d822453f58da Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 11:03:54 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fea0ea02a6..b30639a95b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,9 +27,9 @@ jobs:
           name: Unzip Forge
           command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
          
-      - run:
-          name: Dependencies
-          command: gradle dependencies
+      #- run:
+      #    name: Dependencies
+      #    command: gradle dependencies
           
       - run:
          name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
-- 
cgit 


From 9aeb35bb6c65f7ef55d932460f41ce429c4ffc06 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 11:27:17 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b30639a95b..4b4d560dc4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,39 +13,20 @@ jobs:
       
     steps:
       - checkout
+      - run: sudo chmod +x gradlew
       
       #https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
       
-      #- restore_cache:
-      #    key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-          
-      - run:
-          name: Download Forge
-          command: wget https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
-          
-      - run:
-          name: Unzip Forge
-          command: unzip -o forge-1.7.10-10.13.4.1614-1.7.10-src.zip
-         
-      #- run:
-      #    name: Dependencies
-      #    command: gradle dependencies
-          
-      - run:
-         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
-         command: sudo chmod +x ./gradlew
-         
-      - run:
-          name: Setup Forge/MCP
-          command: gradle SetupCIWorkspace
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
           
       - run:
-          name: Eclipse Setup
-          command: gradle eclipse
+          name: Download Build Script
+          command: wget https://alkcorp.overminddl1.com/GTPP_BuildScript.sh
           
       - run:
-          name: Build GT++
-          command: gradle build
+          name: Run Build Script
+          command: sh GTPP_BuildScript.sh
           
       - save_cache:
           paths:
-- 
cgit 


From c2b9b27d1904787d8e56aabcc8104ff1c996e40d Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 11:34:23 +0000
Subject: % Updated CircleCI config

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4b4d560dc4..44e01b7e7d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ jobs:
       #https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-src.zip
       
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "build.gradle" }}
           
       - run:
           name: Download Build Script
@@ -31,7 +31,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "build.gradle" }}
 
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ 
           path: app/build/reports
-- 
cgit 


From 3cabd5d9124418f80210ce32e1b9250efc9c6339 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 7 Feb 2019 11:37:37 +0000
Subject: % Updated CircleCI config

> Should be the final change here, since I have moved the logic external to a bash script.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44e01b7e7d..c52e759544 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,8 +34,8 @@ jobs:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "build.gradle" }}
 
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ 
-          path: app/build/reports
+          path: logs
           destination: reports
       - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
-          path: app/build/test-results
+          path: build/libs
       # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
-- 
cgit