Overhaul, hopefully dual target CF and Artifact builds

Author: robotgryphon

.github/workflows/test-build.yml

@@ -1,13 +1,10 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
 name: Test Build and Changelog
 
 on:
   workflow_dispatch:
 
 jobs:
-  generate:
+  changelog:
     name: Generate Changelog (tags)
     runs-on: ubuntu-latest
     steps:
@@ -56,76 +53,57 @@ jobs:
           name: out
           path: .github/CHANGELOG.md
 
-  build:
-    name: Gradle Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-
-    - name: Cache Gradle packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Build with Gradle
-      run: ./gradlew jar
-      env:
-        CF_TOKEN: ${{ secrets.CF_API_TOKEN }}
-        GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Add Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: libs
-        path: build/libs/*.jar
-
-  view:
-    name: View Changelog Output
+  curseforge:
+    name: Upload to CurseForge
     runs-on: ubuntu-latest
-    needs: [generate]
+    needs: [changelog]
     steps:
-      - name: Download Build Results
+      - name: Download Changelog Results
         uses: actions/download-artifact@v2
         with:
           name: out
           path: changelog
 
-      - run: cat changelog/CHANGELOG.md
-
-  upload:
-    name: Upload to CurseForge
-    runs-on: ubuntu-latest
-    needs: [generate, build]
-    env:
-      CF_TOKEN: ${{ secrets.CF_API_TOKEN }}
-
-    steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-          
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+        - name: Grant execute permission for gradlew
+          run: chmod +x gradlew
+
+        - name: Build JAR
+          run: /gradlew jar
+
+        - name: Do Upload
+          run: ./gradlew curseforge
+          env:
+            CF_TOKEN: ${{ secrets.CF_API_TOKEN }}
+
+        - name: Add Artifact
+            uses: actions/upload-artifact@v2
+            with:
+              name: result
+              path: .
+
+  view:
+    name: View Changelog Output
+    runs-on: ubuntu-latest
+    needs: [changelog]
+    steps:
       - name: Download Build Results
         uses: actions/download-artifact@v2
         with:
           name: out
           path: changelog
-
-      - name: Do Upload
-        run: ./gradlew curseforge
+      - run: cat changelog/CHANGELOG.md