Update CICD

Author: tier940

.github/actions/build_setup/action.yml

@@ -12,7 +12,7 @@ runs:
 
   steps:
     - name: Set up JDK 8 and 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         cache: gradle
         distribution: 'zulu'
@@ -21,7 +21,7 @@ runs:
           17
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
       with:
         cache-write-only: ${{ inputs.update-cache }}
         gradle-home-cache-includes: |

.github/workflows/build_and_test.yml

@@ -16,7 +16,7 @@ on:
         type: boolean
 
 concurrency:
-  group: build-and-test-${{ github.head_ref || github.ref }}
+  group: build-and-test-${{ inputs.target_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -29,19 +29,21 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Apply patch to gradle.properties
-        run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.target_branch || github.ref }}
+        
+      - name: Apply patch to buildscript.properties
+        run: sed -i 's/debug_all = false/debug_all = true/g' buildscript.properties
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
       - name: Compile the mod
-        run: ./gradlew --info --scan assemble
+        run: ./gradlew --info --scan --stacktrace assemble
 
       - name: Upload Jars
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: GTExpert-Core
           path: build/libs/*.jar

.github/workflows/format_java.yml

@@ -2,15 +2,11 @@
 name: Java Formatting
 
 on:
-  push:
-    branches:
-      - master
-    paths: ['src/main/java/**', 'src/test/**']
   pull_request:
     paths: ['src/main/java/**', 'src/test/**']
 
 concurrency:
-  group: format-${{ github.head_ref || github.ref }}
+  group: format-${{ inputs.target_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -24,19 +20,29 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
-          ref: ${{ github.head_ref }}
+          ref: ${{ inputs.target_branch || github.ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
+      - name: Check if PR is from a fork
+        id: fork-check
+        run: |
+          if [ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]; then
+            echo "is_fork=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_fork=false" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
       - name: Run Spotless Formatting Check with Gradle
         id: build
-        run: ./gradlew --info spotlessCheck
+        run: ./gradlew --info --stacktrace spotlessCheck
 
       - name: Attempt to make a PR fixing spotless errors
-        if: failure() && steps.build.conclusion == 'failure'
+        if: failure() && steps.build.conclusion == 'failure' && steps.fork-check.outputs.is_fork == 'false'
         run: |
           git reset --hard
           git checkout "${PR_BRANCH}"
@@ -54,9 +60,16 @@ jobs:
             --body "Automatic spotless apply to fix formatting errors, applies to PR #${PR_NUMBER}" \
             2>&1 | tee pr-message.log || true
           gh pr comment "${PR_BRANCH}" -F pr-message.log || true
-        shell: bash # ensures set -eo pipefail
+        shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_BRANCH: ${{ github.event.pull_request.head.ref }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           FIXED_BRANCH: ${{ github.head_ref }}-spotless-fixes
+
+      - name: Comment to PR if from fork and formatting failed
+        if: failure() && steps.build.conclusion == 'failure' && steps.fork-check.outputs.is_fork == 'true'
+        run: |
+          gh pr comment ${{ github.event.pull_request.number }} --body "I can't get automatic fixes by spotless in CI. Please run '. /gradlew spotlessApply' and push again."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -18,18 +18,18 @@ on:
 
 env:
   # link to the changelog with a format code for the version
-  CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/GTExpertCore-v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }})"
+  CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/GTWoodProcessing-v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }})"
   # Version of the mod
   FULL_VERSION: "${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}"
   # type of release
-  NAME: "GTExpertCore"
+  NAME: "GTWoodProcessing"
 
   # Curseforge and Modrinth project IDs
-  CURSEFORGE_PROJECT_ID: "851103"
-  MODRINTH_PROJECT_ID: "ipueNiWG"
+  CURSEFORGE_PROJECT_ID: "1093753"
+  MODRINTH_PROJECT_ID: "LRBGeIQP"
 
 concurrency:
-  group: publish-${{ github.head_ref || github.ref }}
+  group: publish-${{ inputs.target_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -42,7 +42,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.target_branch || github.ref }}
+          fetch-tags: true
 
       - name: Check if tag already exists
         run: |
@@ -52,14 +55,14 @@ jobs:
           fi
 
       - name: Set version
-        run: sed -i "s/modVersion.*=.*/modVersion = ${{ env.FULL_VERSION }}/g" gradle.properties
+        run: sed -i "s/modVersion.*=.*/modVersion = ${{ env.FULL_VERSION }}/g" buildscript.properties
 
-      - name: Commit and push gradle.properties
-        uses: stefanzweifel/git-auto-commit-action@v5
+      - name: Commit and push buildscript.properties
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: "Bump version to v${{ env.FULL_VERSION }}"
           commit_options: '--no-verify'
-          file_pattern: gradle.properties
+          file_pattern: buildscript.properties
           tagging_message: "v${{ env.FULL_VERSION }}"
 
       - name: Setup Build
@@ -79,36 +82,32 @@ jobs:
           modrinth-id: ${{ env.MODRINTH_PROJECT_ID }}
           modrinth-token: "${{ secrets.MODRINTH_API_KEY }}"
           modrinth-dependencies: |
-            G1ckZuWK(required)
             tULldUx4(required)
-            tZiutdLG(required)
           curseforge-id: ${{ env.CURSEFORGE_PROJECT_ID }}
           curseforge-token: "${{ secrets.CURSEFORGE_API_KEY }}"
           curseforge-dependencies: |
-            mixin-booter(required)
             gregtech-ce-unofficial(required)
-            gregicality-multiblocks(required)
-            implosionnobomb(recommended)
-            ae2-extended-life(recommended)
-            ae-additions-extra-cells-2-fork(recommended)
-            nae2(recommended)
-            ender-io-base(recommended)
-            ender-io-machines(recommended)
-            ender-io-endergy(recommended)
-            ender-io-conduits(recommended)
-            ender-io-ae2-conduits(recommended)
-            gregtech-food-option(recommended)
-            chisel(recommended)
-            extracpus(recommended)
-            draconic-evolution(recommended)
-            draconicadditions(recommended)
-            project-red-illumination(recommended)
-            avaritia-1-1x-unofficial(recommended)
-            thaumcraft(recommended)
-            forestry(recommended)
-            gendustry(recommended)
-            binnies-mods-patched(recommended)
-            ulv-covers(incompatible)
+            advanced-rocketry(optional)
+            binnies-mods-patched(optional)
+            biomes-o-plenty(optional)
+            botania(optional)
+            extra-utilities(optional)
+            forestry(optional)
+            gregtech-food-option(optional)
+            ice-and-fire-dragons(optional)
+            integrated-dynamics(optional)
+            mystical-world(optional)
+            natura(optional)
+            nether-update-backport(optional)
+            plants(optional)
+            project-vibrant-journeys(optional)
+            random-things(optional)
+            roots(optional)
+            rustic(optional)
+            thaumcraft(optional)
+            the-twilight-forest(optional)
+            traverse-reforged(optional)
+            wizardry-mod(optional)
           files: |
             build/libs/!(*-@(dev|sources|javadoc)).jar
             build/libs/*-@(sources).jar

.github/workflows/rebase.yml

@@ -2,15 +2,12 @@
 name: Java Tests
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - '*'
 
 concurrency:
-  group: test-${{ github.head_ref || github.ref }}
+  group: test-${{ inputs.target_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -20,13 +17,15 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.target_branch || github.ref }}
 
-      - name: Apply patch to build.gradle
-        run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
+      - name: Apply patch to buildscript.properties
+        run: sed -i 's/debug_all = false/debug_all = true/g' buildscript.properties
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
       - name: Run Tests with Gradle
-        run: ./gradlew --info --scan test
+        run: ./gradlew --info --scan --stacktrace test

.github/workflows/test_java.yml

@@ -19,13 +19,15 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.target_branch || github.ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
       - name: Run Buildscript Updater
-        run: ./gradlew --info updateBuildScript
+        run: ./gradlew --info --stacktrace updateBuildScript
 
       - name: Get New Buildscript Version
         id: version-check
@@ -35,7 +37,7 @@ jobs:
 
       - name: Create Pull Request
         id: create-pull-request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/update_buildscript.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: gradle-cache-${{ github.ref }}
+  group: gradle-cache-${{ inputs.target_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -19,12 +19,14 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.target_branch || github.ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
         with:
           update-cache: true
 
       - name: Build Project with Gradle
-        run: ./gradlew --info assemble
+        run: ./gradlew --info --stacktrace assemble