fix: select JDK/build task from branch gradle.properties in CI

26.1 requires Java 25; Dev Builds previously always used the build.yml default of 21. Each branch now declares ci_java_version and ci_build_task.

Author: SkyDynamic

.github/workflows/build-branches.yml

@@ -28,12 +28,30 @@ jobs:
         with:
           ref: ${{ matrix.branch }}
 
+      - name: Resolve CI Java / build task
+        id: ci_meta
+        run: |
+          # Prefer values from the checked-out branch; fall back to matrix / defaults.
+          JAVA=$(grep -E '^[[:space:]]*ci_java_version[[:space:]]*=' gradle.properties | tail -1 | cut -d= -f2- | tr -d ' \r' || true)
+          TASK=$(grep -E '^[[:space:]]*ci_build_task[[:space:]]*=' gradle.properties | tail -1 | cut -d= -f2- | tr -d ' \r' || true)
+          if [ -z "$JAVA" ]; then JAVA='${{ matrix.java }}'; fi
+          if [ -z "$TASK" ]; then TASK='${{ matrix.build_task }}'; fi
+          echo "java=${JAVA:-21}" >> "$GITHUB_OUTPUT"
+          echo "task=${TASK:-remapJar}" >> "$GITHUB_OUTPUT"
+          echo "Branch ${{ matrix.branch }} -> java=${JAVA:-21} task=${TASK:-remapJar}"
+          java -version || true
+
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: ${{ steps.ci_meta.outputs.java }}
           distribution: 'temurin'
 
+      - name: Verify Java
+        run: |
+          echo "JAVA_HOME=$JAVA_HOME"
+          java -version
+
       - name: Cache gradle files
         uses: actions/cache@v4
         with:
@@ -50,7 +68,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew ${{ matrix.build_task }} --no-daemon
+        run: ./gradlew ${{ steps.ci_meta.outputs.task }} --no-daemon
         env:
           BUILD_TAG: ${{ inputs.tag }}
           BUILD_ID: ${{ github.run_number }}

.github/workflows/build.yml

@@ -16,16 +16,6 @@ on:
         required: false
         description: Git ref/branch to checkout; empty uses the triggering ref
         default: ''
-      java_version:
-        type: string
-        required: false
-        description: JDK major version
-        default: '21'
-      build_task:
-        type: string
-        required: false
-        description: Gradle task to run
-        default: 'remapJar'
       artifact_name:
         type: string
         required: false
@@ -47,10 +37,19 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
+      - name: Resolve CI Java / build task
+        id: ci_meta
+        run: |
+          JAVA=$(grep -E '^[[:space:]]*ci_java_version[[:space:]]*=' gradle.properties | tail -1 | cut -d= -f2- | tr -d ' \r' || true)
+          TASK=$(grep -E '^[[:space:]]*ci_build_task[[:space:]]*=' gradle.properties | tail -1 | cut -d= -f2- | tr -d ' \r' || true)
+          echo "java=${JAVA:-21}" >> "$GITHUB_OUTPUT"
+          echo "task=${TASK:-remapJar}" >> "$GITHUB_OUTPUT"
+          echo "Resolved ci_java_version=${JAVA:-21} ci_build_task=${TASK:-remapJar}"
+
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ inputs.java_version }}
+          java-version: ${{ steps.ci_meta.outputs.java }}
           distribution: 'temurin'
 
       - name: Cache gradle files
@@ -68,7 +67,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew ${{ inputs.build_task }} --no-daemon
+        run: ./gradlew ${{ steps.ci_meta.outputs.task }} --no-daemon
         env:
           BUILD_TAG: ${{ inputs.tag }}
           BUILD_ID: ${{ github.run_number }}

gradle.properties

@@ -16,3 +16,7 @@ fabric_api_version = 0.91.6+1.20.2
 neoforge_version = 20.2.93
 
 incremental_storage_lib_version=1.3.0+build.26030517.05
+
+# CI build settings (read by GitHub Actions after checkout)
+ci_java_version = 21
+ci_build_task = remapJar