From 57ec6def0f105fb1a94a6609cb0598b31e764262 Mon Sep 17 00:00:00 2001 From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com> Date: Sun, 23 Jul 2023 14:01:30 +0200 Subject: [PATCH 1/3] [1.7.2] Bump version --- gradle.properties | 2 +- .../src/main/java/me/earth/headlessmc/launcher/Launcher.java | 2 +- headlessmc-scripts/hmc | 2 +- headlessmc-scripts/hmc.bat | 2 +- headlessmc-scripts/hmw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a90bead1..06329b1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -project_version=1.7.1 +project_version=1.7.2 diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java index 52d2b8bd..1d609a18 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java @@ -15,7 +15,7 @@ @Getter @RequiredArgsConstructor public class Launcher implements HeadlessMc { - public static final String VERSION = "1.7.1"; + public static final String VERSION = "1.7.2"; @Delegate private final HeadlessMc headlessMc; diff --git a/headlessmc-scripts/hmc b/headlessmc-scripts/hmc index 8072762a..62af811b 100644 --- a/headlessmc-scripts/hmc +++ b/headlessmc-scripts/hmc @@ -1,2 +1,2 @@ #!/usr/bin/env sh -java -jar headlessmc-launcher-1.7.1.jar --command $@ +java -jar headlessmc-launcher-1.7.2.jar --command $@ diff --git a/headlessmc-scripts/hmc.bat b/headlessmc-scripts/hmc.bat index 6763c00a..1bf17cba 100644 --- a/headlessmc-scripts/hmc.bat +++ b/headlessmc-scripts/hmc.bat @@ -1,2 +1,2 @@ @echo off -"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.1.jar --command %* +"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.2.jar --command %* diff --git a/headlessmc-scripts/hmw b/headlessmc-scripts/hmw index dfcd4780..5f24a5ec 100644 --- a/headlessmc-scripts/hmw +++ b/headlessmc-scripts/hmw @@ -1,3 +1,3 @@ #!/bin/bash # when running in docker on windows bash seems to be at /bin/bash TODO: can we make this one script? -java -jar headlessmc-launcher-1.7.1.jar --command $@ +java -jar headlessmc-launcher-1.7.2.jar --command $@ From 7afbe4eb65512bdc9a34f30b59c3492be0282372 Mon Sep 17 00:00:00 2001 From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com> Date: Sun, 23 Jul 2023 14:04:25 +0200 Subject: [PATCH 2/3] [1.7.2] Use shadowed jars instead of dev jars, fixes #83, fixes #85 --- build.gradle | 14 +++++++++----- headlessmc-lwjgl/build.gradle | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 41131f74..05b37380 100644 --- a/build.gradle +++ b/build.gradle @@ -131,9 +131,13 @@ allprojects { } } + jar { + classifier 'dev' + } + shadowJar { configurations = [project.configurations.jarLibs, project.configurations.jarLibsApi] - classifier 'release' + classifier '' } jar.finalizedBy(shadowJar) @@ -208,13 +212,13 @@ tasks.register('jacocoRootReport', JacocoReport) { } tasks.register('copyJars', Copy) { - dependsOn subprojects.jar - from(subprojects.jar) + dependsOn subprojects.shadowJar + from(subprojects.shadowJar) into project.file(System.getProperty('hmc.jar.dir', 'build/libs')) } -jar { - dependsOn(subprojects.jar) +build { + dependsOn(subprojects.shadowJar) finalizedBy(copyJars) } diff --git a/headlessmc-lwjgl/build.gradle b/headlessmc-lwjgl/build.gradle index 0af36afb..f61940f7 100644 --- a/headlessmc-lwjgl/build.gradle +++ b/headlessmc-lwjgl/build.gradle @@ -75,7 +75,7 @@ tasks.register('testAgent', Test) { } jvmArgs = [ - "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}-release.jar", + "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}.jar", '-Dhmc.lwjgl.agenttest=true' ] From d81dd88beedc0794b0665fdde5aca40464eebf33 Mon Sep 17 00:00:00 2001 From: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com> Date: Sun, 23 Jul 2023 14:13:49 +0200 Subject: [PATCH 3/3] [1.7.2] Test if the docker image builds --- .github/workflows/docker_no_push.yml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/docker_no_push.yml diff --git a/.github/workflows/docker_no_push.yml b/.github/workflows/docker_no_push.yml new file mode 100644 index 00000000..93349d06 --- /dev/null +++ b/.github/workflows/docker_no_push.yml @@ -0,0 +1,29 @@ +name: Docker test image build + +on: + push: + pull_request: + types: [opened, reopened] + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Build + uses: docker/build-push-action@v4 + with: + push: false + tags: 3arthqu4ke/headlessmc:latest + - name: Publish bat script + uses: actions/upload-artifact@v3 + with: + name: HeadlessMc + path: ./headlessmc-scripts/hmc.bat +