From 0524d0f20ad69203c60181552c3453683ba89252 Mon Sep 17 00:00:00 2001 From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:43:03 +0100 Subject: [PATCH] mc-runtime-test, use correct launcher.jar --- .github/workflows/run-matrix-in-memory.yml | 4 +++- .github/workflows/run-matrix-xvfb.yml | 4 +++- .github/workflows/run-matrix.yml | 4 +++- .github/workflows/run-specific-all-modloaders.yml | 4 +++- .github/workflows/run-specific.yml | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-matrix-in-memory.yml b/.github/workflows/run-matrix-in-memory.yml index 6884344..8bd2867 100644 --- a/.github/workflows/run-matrix-in-memory.yml +++ b/.github/workflows/run-matrix-in-memory.yml @@ -107,7 +107,8 @@ jobs: - 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-.jar + run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar - name: Run the MC client uses: 3arthqu4ke/mc-runtime-test@3.0.0 with: @@ -116,6 +117,7 @@ jobs: 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 index bb2f805..3ec0ebc 100644 --- a/.github/workflows/run-matrix-xvfb.yml +++ b/.github/workflows/run-matrix-xvfb.yml @@ -103,7 +103,8 @@ jobs: - 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-.jar + run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar - name: Run the MC client uses: 3arthqu4ke/mc-runtime-test@3.0.0 with: @@ -111,6 +112,7 @@ jobs: 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 index e8c24af..7350c74 100644 --- a/.github/workflows/run-matrix.yml +++ b/.github/workflows/run-matrix.yml @@ -103,7 +103,8 @@ jobs: - 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-.jar + run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar - name: Run the MC client uses: 3arthqu4ke/mc-runtime-test@3.0.0 with: @@ -112,6 +113,7 @@ jobs: 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 index a1b9a4b..2ad9ed5 100644 --- a/.github/workflows/run-specific-all-modloaders.yml +++ b/.github/workflows/run-specific-all-modloaders.yml @@ -72,7 +72,8 @@ jobs: - 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-.jar + run: cp launcher-jar/headlessmc-launcher.jar headlessmc-launcher-0.0.0.jar - name: Run the MC client uses: 3arthqu4ke/mc-runtime-test@3.0.0 with: @@ -83,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 index bca1fe8..ac21c6e 100644 --- a/.github/workflows/run-specific.yml +++ b/.github/workflows/run-specific.yml @@ -61,7 +61,8 @@ 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@3.0.0 @@ -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