feat(action): Windows support (#128)

Author: okafke

.github/workflows/lifecycle.yml

@@ -82,12 +82,10 @@ jobs:
 
       - id: matrices # TODO: build origin matrices dynamically, consider collapsing this into a .py
         name: Construct matrices
-        env:
-          PR_COMMENT_BODY: ${{ github.event.pull_request.body }}
         run: |
           import os
           import json
-          import re
+          import copy
 
           build_matrix = {"include": []}
           run_matrix = {"version": []}
@@ -106,17 +104,6 @@ jobs:
               if "${{ steps.filter.outcome }}" == "success":
                 # Filter matrices based on the detected changes
                 dirs_to_filter = json.loads('${{ steps.filter.outputs.changes }}')
-                comment_body = os.getenv('PR_COMMENT_BODY')
-                print("PR-comment:", comment_body)
-                if comment_body:
-                  pattern = r'Automatic commit: build and run ([0-9\.]*[0-9]*) in ([0-9_]*[0-9]*)'
-                  match = re.search(pattern, comment_body)
-                  if match:
-                    mc_versions = [ match.group(1) ]
-                    dirs_to_filter = [ match.group(2) ]
-                    print('Matched PR body', mc_versions, dirs_to_filter)
-                  else:
-                    print('PR body did not match')
 
             case 'workflow_dispatch':
               input_dirs = '${{ github.event.inputs.dirs }}'
@@ -136,10 +123,30 @@ jobs:
                 build_matrix['include'], run_matrix['version'] = build_data, run_data
 
           if dirs_to_filter:
-            build_matrix['include'].extend([item for item in build_data if item["dir"] in dirs_to_filter and (item["mc"] in mc_versions or not mc_versions)])
+            build_matrix['include'].extend([item for item in build_data if item["dir"] in dirs_to_filter and ("mc" not in item or (item["mc"] in mc_versions or not mc_versions))])
             mc_versions = mc_versions if mc_versions else [item.get("mc") for item in build_matrix["include"] if "mc" in item]
             run_matrix['version'].extend([item for item in run_data if item["mc"] in mc_versions])
 
+          for entry in run_matrix['version']:
+            entry['runner'] = 'ubuntu-latest' #'blacksmith-2vcpu-ubuntu-2204'
+            entry['cache'] = 'github' #'blacksmith'
+            entry['xvfb'] = True
+          
+          additional_runs = []
+          for item in run_matrix['version']:
+            #runners = [ ('blacksmith-2vcpu-ubuntu-2204', 'blacksmith') ] # also add non-xvfb runs for ubuntu
+            runners = [ ('ubuntu-latest', 'github') ] # also add non-xvfb runs for ubuntu
+            if len(additional_runs) < 9: # add other runners only for the latest version * 3 modloaders * 3 runners
+              runners += [ ('windows-latest', 'github'), ('macos-latest', 'github') ]
+            for runner, cache in runners:
+              entry = copy.deepcopy(item)
+              entry['runner'] = runner
+              entry['cache'] = cache
+              entry['xvfb'] = False
+              additional_runs.append(entry)
+          
+          run_matrix['version'] += additional_runs
+          
           with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
             print(json.dumps(build_matrix, indent=2))
             fh.write(f'build-matrix={json.dumps(build_matrix)}\n')
@@ -164,17 +171,16 @@ jobs:
       java: ${{ matrix.java }}
 
   run:
-    if: github.event_name != 'push'
+    if: github.event_name != 'push' && fromJSON(needs.matrices.outputs.run-matrix).version[0] != null
     name: Run tests
     needs:
       - matrices
       - build
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.version.runner }}
     strategy:
       fail-fast: false
       matrix:
         ${{ insert }}: ${{ fromJSON(needs.matrices.outputs.run-matrix) }}
-        xvfb: [true, false]
     steps:
       - name: Checkout # TODO: simplify away this step, currently needed for `uses: ./`
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -191,24 +197,32 @@ jobs:
           mkdir -p run/mods
           cp mc-runtime-test-*-${{ matrix.version.type }}-release.jar run/mods
 
-      - name: Setup Java temurin-${{ matrix.version.java }}
+      - name: Setup Github Java temurin-${{ matrix.version.java }}
+        if: matrix.version.cache == 'github'
         uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.version.java }}
           distribution: temurin
 
+      - name: Setup Blacksmith Java temurin-${{ matrix.version.java }}
+        if: matrix.version.cache == 'blacksmith'
+        uses: useblacksmith/setup-java@4ef812391eff6e9737ba13bf0356d0f702877a64 # v5
+        with:
+          java-version: ${{ matrix.version.java }}
+          distribution: temurin
+
       - name: Run game
         timeout-minutes: 3
         uses: ./
         with:
-          cache-mc: "github"
+          cache-mc: ${{ matrix.version.cache }}
           mc: ${{ matrix.version.mc }}
           mc-runtime-test: none
           modloader: ${{ matrix.version.modloader }}
           regex: ${{ matrix.version.regex }}
           java: ${{ matrix.version.java }}
-          xvfb: ${{ matrix.xvfb }}
-          headlessmc-command: ${{ !matrix.xvfb && '-lwjgl' || '' }} --retries 3 --jvm -Djava.awt.headless=true
+          xvfb: ${{ matrix.version.xvfb }}
+          headlessmc-command: ${{ !matrix.version.xvfb && '-lwjgl' || '' }} --retries 3 --jvm -Djava.awt.headless=true
 
   release:
     if: needs.release-please.outputs.release_created == 'true'

.github/workflows/new-mc-version.yml

@@ -8,3 +8,4 @@ lexforge_version = 62.0.9
 fabric_version = 0.15.9
 # Whether to use the headlessmc lwjgl agent or not
 hmc.lwjgl=false
+

26_1/gradle.properties

@@ -61,7 +61,7 @@ on:
   workflow_dispatch:
 
 env:
-  java_version: 21
+  java_version: 25
 
 jobs:
   run:
@@ -84,7 +84,7 @@ jobs:
       - name: Run MC test client
         uses: headlesshq/mc-runtime-test@4.2.0 <!-- x-release-please-version -->
         with:
-          mc: 26.1
+          mc: 26.1.1
           modloader: fabric
           regex: .*fabric.*
           mc-runtime-test: fabric

README.md

@@ -16,7 +16,7 @@ inputs:
     description: Regex to match the modloader jar (i.e. .*fabric.*)
     required: true
   java:
-    description: Java version to use (8, 16, 17, 21)
+    description: Java version to use (8, 16, 17, 21, 25)
     required: true
   dummy-assets:
     description: Use dummy assets during testing
@@ -49,7 +49,8 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Bootstrap HeadlessMC
+    - name: Bootstrap HeadlessMc (Linux)
+      if: runner.os != 'Windows'
       run: |
         mkdir -p HeadlessMC run/mods
         cat <<EOF >> HeadlessMC/config.properties
@@ -61,6 +62,22 @@ runs:
         EOF
       shell: bash
 
+    - name: Bootstrap HeadlessMc (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        New-Item -ItemType Directory -Force -Path HeadlessMC, run/mods | Out-Null
+        $currentDir = (Get-Location).Path -replace '\\', '\\\\'
+        $javaPath = "$env:JAVA_HOME\bin\java.exe" -replace '\\', '\\\\'
+        $config = @(
+          "hmc.java.versions=$javaPath",
+          "hmc.gamedir=$currentDir\\run",
+          "hmc.offline=true",
+          "hmc.rethrow.launch.exceptions=true",
+          "hmc.exit.on.failed.command=true"
+        )
+        $config | Set-Content -Path HeadlessMC\config.properties -Encoding utf8
+      shell: pwsh
+
     - if: inputs.dummy-assets == 'true'
       name: Configure Dummy Assets
       run: echo hmc.assets.dummy=true >> HeadlessMC/config.properties