Completely refactored again

.github/workflows/CI.yml

@@ -30,9 +30,12 @@ jobs:
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ./.gradle/loom-caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }}
+          restore-keys: ${{ runner.os }}-gradle-
 
       - name: Get short commit sha
         id: get_short_sha
@@ -68,28 +71,33 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.mod_name.outputs.value }} ${{ steps.mod_version.outputs.value }}.${{ github.run_number}}+${{ steps.get_short_sha.outputs.short_sha }}
-          path: build/libs/
+          path: fabricWrapper/build/libs/
 
-      - name: Create Github release
+      - name: Create Github Release
         uses: marvinpinto/[email protected]
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "dev"
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          automatic_release_tag: dev-${{ github.run_number}}
           prerelease: true
           title: "[CI#${{ github.run_number}}]${{ steps.mod_name.outputs.value }} ${{ steps.mod_version.outputs.value }}.${{ github.run_number}}+${{ steps.get_short_sha.outputs.short_sha }}"
           files: |
             LICENSE
-            build/libs/*.jar
+            fabricWrapper/build/libs/*.jar
 
-      - name: Publish realease to curseforge
-        if: contains(github.event.head_commit.message, '[publish skip]') == false
+      - name: Update Github Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: dev-${{ github.run_number}}
+          generate_release_notes: true
+
+      - name: Publish release to Curseforge
+        if: contains(github.event.head_commit.message, '[publish skip]') == false && contains(github.event.ref, 'refs/heads/exp') == false
         uses: Kir-Antipov/[email protected]
         with:
           curseforge-id: 478757
           curseforge-token: ${{ secrets.CF_API_TOKEN }}
-
-          files-primary: build/libs/!(*-@(dev|sources)).jar
-          files-secondary: build/libs/*-@(dev|sources).jar
+          files-primary: fabricWrapper/build/libs/!(*-@(dev|sources)).jar
+          files-secondary: ''
 
           name: ''
           version: ${{ steps.mod_version.outputs.value }}.${{ github.run_number}}+${{ steps.get_short_sha.outputs.short_sha }}
@@ -141,9 +149,13 @@ jobs:
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ./.gradle/loom-caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
 
       - name: Get short commit sha
         id: get_short_sha
@@ -179,16 +191,16 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.mod_name.outputs.value }} ${{ steps.mod_version.outputs.value }}.${{ github.run_number}}+${{ steps.get_short_sha.outputs.short_sha }}
-          path: build/libs/
+          path: fabricWrapper/build/libs/
 
       - name: Publish realease to curseforge
         uses: Kir-Antipov/[email protected]
         with:
           curseforge-id: 478757
           curseforge-token: ${{ secrets.CF_API_TOKEN }}
 
-          files-primary: build/libs/!(*-@(dev|sources)).jar
-          files-secondary: build/libs/*-@(dev|sources).jar
+          files-primary: fabricWrapper/build/libs/!(*-@(dev|sources)).jar
+          files-secondary: ''
 
           name: ''
           version: ${{ steps.mod_version.outputs.value }}.${{ github.run_number}}+${{ steps.get_short_sha.outputs.short_sha }}

.gitignore

@@ -3,6 +3,7 @@
 .gradle/
 build/
 out/
+publish/
 classes/
 
 # eclipse
@@ -24,6 +25,10 @@ bin/
 .classpath
 .project
 
+# macos
+
+*.DS_Store
+
 # fabric
 
-run/
+run/