fix cicd

Author: tier940

.github/workflows/build_and_test.yml

@@ -4,6 +4,10 @@ name: Build and test
 on:
   workflow_dispatch:
     inputs:
+      target_branch:
+        description: 'Target branch to build'
+        required: false
+        type: string
       timeout:
         description: 'Timeout for runServer (seconds)'
         required: false
@@ -16,7 +20,7 @@ on:
         type: boolean
 
 concurrency:
-  group: build-and-test-${{ inputs.target_branch || github.ref }}
+  group: build-and-test-${{ inputs.target_branch || github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -32,7 +36,7 @@ jobs:
         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
 
@@ -43,7 +47,7 @@ jobs:
         run: ./gradlew --info --scan --stacktrace assemble
 
       - name: Upload Jars
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: GTMoreTools
           path: build/libs/*.jar

.github/workflows/format_java.yml

@@ -6,7 +6,7 @@ on:
     paths: ['src/main/java/**', 'src/test/**']
 
 concurrency:
-  group: format-${{ inputs.target_branch || github.ref }}
+  group: format-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.target_branch || github.ref }}
+          ref: ${{ github.head_ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup
@@ -70,6 +70,6 @@ jobs:
       - 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."
+          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

@@ -29,7 +29,7 @@ env:
   MODRINTH_PROJECT_ID: "iPEC89hE"
 
 concurrency:
-  group: publish-${{ inputs.target_branch || github.ref }}
+  group: publish-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -44,7 +44,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.target_branch || github.ref }}
+          ref: ${{ github.ref }}
           fetch-tags: true
 
       - name: Check if tag already exists

.github/workflows/test_java.yml

@@ -7,7 +7,7 @@ on:
       - '*'
 
 concurrency:
-  group: test-${{ inputs.target_branch || github.ref }}
+  group: test-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -18,8 +18,6 @@ jobs:
     steps:
       - name: Checkout Repository
         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

.github/workflows/update_buildscript.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.target_branch || github.ref }}
+          ref: ${{ github.ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup

.github/workflows/update_gradle_cache.yml

@@ -9,19 +9,17 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: gradle-cache-${{ inputs.target_branch || github.ref }}
+  group: gradle-cache-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   update-cache:
-    name: Update Grade Cache
+    name: Update Gradle Cache
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
-        with:
-          ref: ${{ inputs.target_branch || github.ref }}
 
       - name: Setup Build
         uses: ./.github/actions/build_setup

build.gradle

@@ -103,6 +103,8 @@ propertyDefaultIfUnset("mavenArtifactGroup", getDefaultArtifactGroup())
 propertyDefaultIfUnset("enableModernJavaSyntax", false)
 propertyDefaultIfUnset("enableSpotless", false)
 propertyDefaultIfUnset("enableJUnit", false)
+propertyDefaultIfUnset("buildscriptRepositoryOwner", "GTModpackTeam")
+propertyDefaultIfUnset("buildscriptRepositoryName", "Buildscripts")
 propertyDefaultIfUnsetWithEnvVar("deploymentDebug", false, "DEPLOYMENT_DEBUG")
 
 
@@ -471,6 +473,10 @@ repositories {
             name 'GTCEu Maven'
             url 'https://maven.gtceu.com'
         }
+        maven {
+            name 'Mod Maven'
+            url 'https://modmaven.dev'
+        }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
         // need to add this here even if we did not above
@@ -562,7 +568,7 @@ dependencies {
 
     compileOnlyApi 'org.jetbrains:annotations:24.1.0'
     annotationProcessor 'org.jetbrains:annotations:24.1.0'
-    patchedMinecraft('net.minecraft:launchwrapper:1.17.2') {
+    patchedMinecraft('net.minecraft:launchwrapper:1.17.4') {
         transitive = false
     }
 
@@ -1419,12 +1425,12 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
     }
 }
 
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/build.gradle")
+URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/${project.buildscriptRepositoryOwner}/${project.buildscriptRepositoryName}/master/build.gradle")
 }
 
-static URL availableSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/settings.gradle")
+URL availableSettingsGradleUrl() {
+    new URL("https://raw.githubusercontent.com/${project.buildscriptRepositoryOwner}/${project.buildscriptRepositoryName}/master/settings.gradle")
 }
 
 boolean performBuildScriptUpdate() {

repositories.gradle

@@ -1,11 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {  // Autoconfig and Autosave
-        name 'Mod Maven'
-        url 'https://modmaven.dev'
-    }
-    flatDir {
-        dirs 'libs'
-    }
 }

settings.gradle

@@ -35,7 +35,7 @@ gradleEnterprise {
 
 blowdryerSetup {
     repoSubfolder 'spotless'
-    github 'GTModpackTeam/Buildscripts', 'tag', 'v1.0.3'
+    github 'GTModpackTeam/Buildscripts', 'tag', 'v1.0.4'
 }
 
 rootProject.name = rootProject.projectDir.getName()