Merge pull request #231 from 3arthqu4ke/1.21-workflows

1.21.1 - 1.21.4 support
3arthqu4ke · Jan 21, 2025 · 889ca4d · 889ca4d
2 parents 85f2976 + f215d04
commit 889ca4d
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 11 deletions.
diff --git a/.github/workflows/run-matrix-in-memory.yml b/.github/workflows/run-matrix-in-memory.yml
@@ -46,6 +46,15 @@ jobs:
     strategy:
       matrix:
         version:
+          - { mc: 1.21.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.3, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.3, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.3, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.1, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
           - { mc: 1.21, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
           - { mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
           - { mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
@@ -86,19 +95,26 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     needs: build
     steps:
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.version.java }}
+          distribution: "temurin"
       - uses: actions/download-artifact@v4
       - name: Display structure of downloaded files
         run: ls -R
       - name: Copy launcher jar
-        run: cp launcher-jar/headlessmc-launcher.jar .
+        # rename because mc-runtime-test matches a jar with headlessmc-launcher-<version>.jar
+        run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.2
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}
           regex: ${{ matrix.version.regex }}
           java: ${{ matrix.version.java }}
           mc-runtime-test: ${{ matrix.version.type }}
+          hmc-version: 0.0.0
           xvfb: false
           headlessmc-command: ${{ github.event.inputs.headlessmc-command }}
           download-hmc: false
diff --git a/.github/workflows/run-matrix-xvfb.yml b/.github/workflows/run-matrix-xvfb.yml
@@ -42,6 +42,15 @@ jobs:
     strategy:
       matrix:
         version:
+          - { mc: 1.21.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.3, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.3, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.3, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.1, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
           - { mc: 1.21, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
           - { mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
           - { mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
@@ -82,18 +91,25 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     needs: build
     steps:
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.version.java }}
+          distribution: "temurin"
       - uses: actions/download-artifact@v4
       - name: Display structure of downloaded files
         run: ls -R
       - name: Copy launcher jar
-        run: cp launcher-jar/headlessmc-launcher.jar .
+        # rename because mc-runtime-test matches a jar with headlessmc-launcher-<version>.jar
+        run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.2
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}
           regex: ${{ matrix.version.regex }}
           java: ${{ matrix.version.java }}
+          hmc-version: 0.0.0
           mc-runtime-test: ${{ matrix.version.type }}
           xvfb: true
           headlessmc-command: --retries 2 --jvm -Djava.awt.headless=true

diff --git a/.github/workflows/run-matrix.yml b/.github/workflows/run-matrix.yml
@@ -42,6 +42,15 @@ jobs:
     strategy:
       matrix:
         version:
+          - { mc: 1.21.4, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.4, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.3, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.3, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.3, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
+          - { mc: 1.21.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
+          - { mc: 1.21.1, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
+          - { mc: 1.21.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
           - { mc: 1.21, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
           - { mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
           - { mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
@@ -82,19 +91,26 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     needs: build
     steps:
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.version.java }}
+          distribution: "temurin"
       - uses: actions/download-artifact@v4
       - name: Display structure of downloaded files
         run: ls -R
       - name: Copy launcher jar
-        run: cp launcher-jar/headlessmc-launcher.jar .
+        # rename because mc-runtime-test matches a jar with headlessmc-launcher-<version>.jar
+        run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.2
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}
           regex: ${{ matrix.version.regex }}
           java: ${{ matrix.version.java }}
           mc-runtime-test: ${{ matrix.version.type }}
+          hmc-version: 0.0.0
           xvfb: false
           headlessmc-command: -lwjgl --retries 2 --jvm -Djava.awt.headless=true
           download-hmc: false
diff --git a/.github/workflows/run-specific-all-modloaders.yml b/.github/workflows/run-specific-all-modloaders.yml
@@ -63,13 +63,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.version.java }}
+          distribution: "temurin"
       - uses: actions/download-artifact@v4
       - name: Display structure of downloaded files
         run: ls -R
       - name: Copy launcher jar
-        run: cp launcher-jar/headlessmc-launcher.jar .
+        # rename because mc-runtime-test matches a jar with headlessmc-launcher-<version>.jar
+        run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.2
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ github.event.inputs.mc }}
           modloader: ${{ matrix.version.modloader }}
@@ -78,4 +84,5 @@ jobs:
           mc-runtime-test: ${{ matrix.version.type }}
           xvfb: ${{ github.event.inputs.xvfb }}
           headlessmc-command: ${{ github.event.inputs.headlessmc-command }}
+          hmc-version: 0.0.0
           download-hmc: false
diff --git a/.github/workflows/run-specific.yml b/.github/workflows/run-specific.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: ${{ github.event.inputs.java }}
           distribution: temurin
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -61,10 +61,11 @@ jobs:
       - name: Rename launcher jar
         run: mv headlessmc-launcher-wrapper/build/libs/headlessmc-launcher-*.jar headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar
       - name: Copy launcher jar
-        run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .
+
+        run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar
 
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.2
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ github.event.inputs.mc }}
           modloader: ${{ github.event.inputs.modloader }}
@@ -74,4 +75,5 @@ jobs:
           mc-runtime-test: ${{ github.event.inputs.mc-runtime-test }}
           xvfb: ${{ github.event.inputs.xvfb }}
           headlessmc-command: ${{ github.event.inputs.headlessmc-command }}
+          hmc-version: 0.0.0
           download-hmc: false