Fix CICD

Author: tier940

.github/actions/build_setup/action.yml

@@ -30,3 +30,7 @@ runs:
           notifications
           jdks
           wrapper
+
+    - name: Grant execute permission for gradlew
+      shell: bash
+      run: chmod +x gradlew

.github/workflows/build_and_test.yml

@@ -31,21 +31,12 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to gradle.properties
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Compile the mod
         run: ./gradlew --info --scan assemble
 
@@ -64,7 +55,7 @@ jobs:
         if: ${{ failure() && steps.build_mod.conclusion == 'failure' && github.event_name == 'pull_request' && !github.event.pull_request.draft }}
         run: |
           git reset --hard
-          git checkout "${PR_BRANCH}"
+          git checkout "${github.ref_name}"
           ./gradlew --info spotlessApply || exit 1
           git diff --exit-code && exit 1
           git config user.name "GitHub Actions"
@@ -74,15 +65,14 @@ jobs:
           git push --force-with-lease origin "${FIXED_BRANCH}"
           gh pr create \
             --head "${FIXED_BRANCH}" \
-            --base "${PR_BRANCH}" \
+            --base "${github.ref_name}" \
             --title "Spotless apply for branch ${{ github.event.pull_request.head.ref }} for #${{ github.event.pull_request.number }}" \
             --body "Automatic spotless apply to fix formatting errors, applies to PR #${{ github.event.pull_request.number }}" \
             2>&1 | tee pr-message.log || true
-          gh pr comment "${PR_BRANCH}" -F pr-message.log || true
+          gh pr comment "${github.ref_name}" -F pr-message.log || true
         shell: bash # ensures set -eo pipefail
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_BRANCH: ${{ github.head_ref }}
           FIXED_BRANCH: ${{ github.head_ref }}-spotless-fixes
 
       - name: Run server for ${{ inputs.timeout }} seconds

.github/workflows/buildscript-maintenance.yml

@@ -31,15 +31,12 @@ jobs:
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Run Spotless Formatting Check with Gradle
         id: build
         run: ./gradlew --info spotlessCheck
 
       - name: Attempt to make a PR fixing spotless errors
-        if: failure()
+        if: failure() && steps.build.conclusion == 'failure'
         run: |
           git reset --hard
           git checkout "${PR_BRANCH}"

.github/workflows/format_java.yml

@@ -22,11 +22,11 @@ env:
   # Version of the mod
   FULL_VERSION: "${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}"
   # type of release
-  NAME: "GTWoodProcessing"
+  NAME: "GTExpertCore"
 
   # Curseforge and Modrinth project IDs
-  CURSEFORGE_PROJECT_ID: "1093753"
-  MODRINTH_PROJECT_ID: "LRBGeIQP"
+  CURSEFORGE_PROJECT_ID: "851103"
+  MODRINTH_PROJECT_ID: "ipueNiWG"
 
 concurrency:
   group: publish-${{ github.head_ref || github.ref }}
@@ -65,9 +65,6 @@ jobs:
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Build Project
         run: ./gradlew --info build
 
@@ -82,32 +79,36 @@ 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)
-            advanced-rocketry(recommended)
-            project-vibrant-journeys(recommended)
-            plants(recommended)
-            extra-utilities(recommended)
-            integrated-dynamics(recommended)
-            random-things(recommended)
-            rustic(recommended)
-            mystical-world(recommended)
-            roots(recommended)
-            biomes-o-plenty(recommended)
-            ice-and-fire-dragons(recommended)
-            wizardry-mod(recommended)
-            traverse-reforged(recommended)
-            nether-update-backport(recommended)
-            the-twilight-forest(recommended)
-            botania(recommended)
-            natura(recommended)
+            ulv-covers(incompatible)
           files: |
             build/libs/!(*-@(dev|sources|javadoc)).jar
             build/libs/*-@(sources).jar

.github/workflows/publish.yml

@@ -22,20 +22,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to build.gradle
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Run Tests with Gradle
         run: ./gradlew --info --scan test

.github/workflows/test_java.yml

@@ -24,9 +24,6 @@ jobs:
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Run Buildscript Updater
         run: ./gradlew --info updateBuildScript
 

.github/workflows/update_buildscript.yml

@@ -26,8 +26,5 @@ jobs:
         with:
           update-cache: true
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
       - name: Build Project with Gradle
         run: ./gradlew --info assemble