1.7

.github/workflows/publish.yml

@@ -7,16 +7,16 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:8.6.0-jdk17
-      options: --user root
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: gradle/wrapper-validation-action@v1
-
+      - uses: gradle/wrapper-validation-action@v2
       # Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
       - name: Generate build number
         id: buildnumber

.github/workflows/test-push.yml

@@ -7,45 +7,57 @@ concurrency:
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [8.6.0-jdk17]
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:${{ matrix.version }}
-      options: --user root
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Nobody"
-      - uses: gradle/wrapper-validation-action@v1
-      - run: gradle applyPatches
-      - run: gradle build check -x test --stacktrace --warning-mode fail
+      - uses: gradle/wrapper-validation-action@v2
+      - run: ./gradlew applyPatches
+      - run: ./gradlew build check -x test --stacktrace --warning-mode fail
+        working-directory: quilt-loom
+  build_windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - run: git config --global user.email "[email protected]"
+      - run: git config --global user.name "Nobody"
+      - uses: gradle/wrapper-validation-action@v2
+      - run: ./gradlew applyPatches
+      - run: ./gradlew build check -x test --stacktrace --warning-mode fail
         working-directory: quilt-loom
-
   # This job is used to feed the test matrix of next job to allow the tests to run in parallel
   prepare_test_matrix:
     # Wait to ensure it builds before going running tests
     needs: build
 
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:8.6.0-jdk17
-      options: --user root
-
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Nobody"
-      - uses: gradle/wrapper-validation-action@v1
-      - run: gradle applyPatches
+      - uses: gradle/wrapper-validation-action@v2
+      - run: ./gradlew applyPatches
 
-      - run: gradle writeActionsTestMatrix --stacktrace --warning-mode fail
+      - run: ./gradlew writeActionsTestMatrix --stacktrace --warning-mode fail
         working-directory: quilt-loom
       - id: set-matrix
         run: echo "matrix=$(cat quilt-loom/build/test_matrix.json)" >> $GITHUB_OUTPUT
@@ -62,21 +74,22 @@ jobs:
         version: [8.6.0-jdk17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:${{ matrix.version }}
-      options: --user root
-
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Nobody"
-      - uses: gradle/wrapper-validation-action@v1
-      - run: gradle applyPatches
+      - uses: gradle/wrapper-validation-action@v2
+      - run: ./gradlew applyPatches
 
-      - run: gradle printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
+      - run: ./gradlew printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
         working-directory: quilt-loom
         env:
           TEST_WARNING_MODE: fail
@@ -99,7 +112,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
     runs-on: windows-2022
@@ -111,10 +123,10 @@ jobs:
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Nobody"
       - uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
+      - name: setup jdk
+        uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'temurin'
       - run: ./gradlew applyPatches
       - run: ./gradlew printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
@@ -141,18 +153,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 20 ]
+        java: [ 17, 21 ]
         os: [ windows-2022, ubuntu-22.04, macos-12 ]
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "Nobody"
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'