From ecffb1d61f39bf22c80093310d7f61baf6d4a398 Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 17 Sep 2022 09:22:22 +1000 Subject: [PATCH] Update build release process --- .github/workflows/pre-release.yml | 15 ++++++++++++--- tools/scripts/run_server.bat | 8 ++++++++ tools/scripts/run_server.sh | 5 +++++ tools/scripts/run_web.bat | 8 ++++++++ tools/scripts/run_web.sh | 5 +++++ 5 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 tools/scripts/run_server.bat create mode 100644 tools/scripts/run_server.sh create mode 100644 tools/scripts/run_web.bat create mode 100644 tools/scripts/run_web.sh diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index bdcefd8..82ce570 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -23,24 +23,33 @@ jobs: - name: Build distribution with Gradle run: ./gradlew distZip - - name: Decompress distribution file + - name: Decompress web distribution file uses: montudor/action-zip@v1 with: args: unzip -qq Havana-Web/build/distributions/Havana-Web.zip -d ./release + - name: Decompress server distribution file + uses: montudor/action-zip@v1 + with: + args: unzip -qq Havana-Server/build/distributions/Havana-Server.zip -d ./release + - name: File release preparation run: | + sudo rm -rf ./release/Havana-Web/bin/* + sudo rm -rf ./release/Havana-Web/bin sudo rm -rf ./release/Havana-Server/bin/* sudo rm -rf ./release/Havana-Server/bin sudo mkdir ./Havana sudo mkdir ./Havana/lib - sudo mv ./release/Havana-Server/lib/Havana-Server.jar ./Havana/Havana-Server.jar - sudo mv ./release/Havana-Server/lib/Havana-Web.jar ./Havana/Havana-Web.jar + sudo mv ./release/Havana-Web/lib/Havana-Server.jar ./Havana/Havana-Server.jar + sudo mv ./release/Havana-Web/lib/Havana-Web.jar ./Havana/Havana-Web.jar + sudo mv ./release/Havana-Web/lib/* ./Havana/lib sudo mv ./release/Havana-Server/lib/* ./Havana/lib sudo cp tools/scripts/run_server.bat ./Havana/ sudo cp tools/scripts/run_server.sh ./Havana/ sudo cp tools/scripts/run_web.bat ./Havana/ sudo cp tools/scripts/run_web.sh ./Havana/ + sudo cp tools/scripts/README.txt ./Havana/ - id: sha-short name: Get short SHA diff --git a/tools/scripts/run_server.bat b/tools/scripts/run_server.bat new file mode 100644 index 0000000..e145c32 --- /dev/null +++ b/tools/scripts/run_server.bat @@ -0,0 +1,8 @@ +@echo off +title Havana Server - Habbo Hotel Emulation + +set CLASSPATH=Havana-Server.jar;lib/HikariCP-3.4.1.jar;lib/mariadb-java-client-2.3.0.jar;lib/netty-all-4.1.33.Final.jar;lib/slf4j-log4j12-1.7.25.jar;lib/slf4j-api-1.7.25.jar;lib/log4j-1.2.17.jar;lib/commons-configuration2-2.2.jar;lib/commons-lang3-3.9.jar;lib/commons-lang-2.6.jar;lib/commons-validator-1.6.jar;lib/gson-2.8.0.jar;lib/spring-security-crypto-5.7.3.jar;lib/bcprov-jdk15on-1.70.jar;lib/geoip2-2.12.0.jar;lib/chesslib-1.1.1.jar;lib/commons-beanutils-1.9.2.jar;lib/httpclient-4.5.5.jar;lib/commons-logging-1.2.jar;lib/commons-digester-1.8.1.jar;lib/commons-collections-3.2.2.jar;lib/maxmind-db-1.2.2.jar;lib/jackson-databind-2.9.5.jar;lib/jackson-core-2.9.5.jar;lib/jackson-annotations-2.9.5.jar;lib/httpcore-4.4.9.jar;lib/commons-codec-1.10.jar + + +java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath "%CLASSPATH%" org.alexdev.havana.Havana +pause \ No newline at end of file diff --git a/tools/scripts/run_server.sh b/tools/scripts/run_server.sh new file mode 100644 index 0000000..782329f --- /dev/null +++ b/tools/scripts/run_server.sh @@ -0,0 +1,5 @@ +#!/usr/bin/sh + +CLASSPATH=lib/Havana-Server.jar:lib/HikariCP-3.4.1.jar:lib/mariadb-java-client-2.3.0.jar:lib/netty-all-4.1.33.Final.jar:lib/slf4j-log4j12-1.7.25.jar:lib/slf4j-api-1.7.25.jar:lib/log4j-1.2.17.jar:lib/commons-configuration2-2.2.jar:lib/commons-lang3-3.9.jar:lib/commons-lang-2.6.jar:lib/commons-validator-1.6.jar:lib/gson-2.8.0.jar:lib/spring-security-crypto-5.7.3.jar:lib/bcprov-jdk15on-1.70.jar:lib/geoip2-2.12.0.jar:lib/chesslib-1.1.1.jar:lib/commons-beanutils-1.9.2.jar:lib/httpclient-4.5.5.jar:lib/commons-logging-1.2.jar:lib/commons-digester-1.8.1.jar:lib/commons-collections-3.2.2.jar:lib/maxmind-db-1.2.2.jar:lib/jackson-databind-2.9.5.jar:lib/jackson-core-2.9.5.jar:lib/jackson-annotations-2.9.5.jar:lib/httpcore-4.4.9.jar:lib/commons-codec-1.10.jar + +java -classpath $CLASSPATH org.alexdev.havana.Havana \ No newline at end of file diff --git a/tools/scripts/run_web.bat b/tools/scripts/run_web.bat new file mode 100644 index 0000000..0da006d --- /dev/null +++ b/tools/scripts/run_web.bat @@ -0,0 +1,8 @@ +@echo off +title Havana Server - Habbo Hotel Emulation + +set CLASSPATH=Havana-Web.jar;lib/ini4j-0.5.4.jar;lib/pebble-3.1.5.jar;lib/Havana-Server.jar;lib/HikariCP-3.4.1.jar;lib/mariadb-java-client-2.3.0.jar;lib/commons-configuration2-2.2.jar;lib/commons-text-1.5.jar;lib/htmlcompressor-maven-plugin-1.3.jar;lib/commons-io-2.5.jar;lib/velocity-tools-2.0.jar;lib/struts-taglib-1.3.8.jar;lib/struts-tiles-1.3.8.jar;lib/struts-core-1.3.8.jar;lib/commons-validator-1.6.jar;lib/geoip2-2.12.0.jar;lib/httpclient-4.5.5.jar;lib/duckHTTPD-all.jar;lib/jsoup-1.13.1.jar;lib/slf4j-log4j12-1.7.25.jar;lib/gson-2.8.0.jar;lib/mail-1.4.7.jar;lib/lazysodium-java-5.0.1.jar;lib/resource-loader-2.0.1.jar;lib/jna-5.8.0.jar;lib/unbescape-1.1.6.RELEASE.jar;lib/slf4j-api-1.7.30.jar;lib/commons-lang3-3.9.jar;lib/commons-chain-1.1.jar;lib/commons-digester-1.8.1.jar;lib/commons-beanutils-1.9.2.jar;lib/commons-logging-1.2.jar;lib/velocity-1.6.2.jar;lib/commons-collections-3.2.2.jar;lib/httpcore-4.4.9.jar;lib/commons-codec-1.10.jar;lib/netty-all-4.1.33.Final.jar;lib/log4j-1.2.17.jar;lib/commons-lang-2.6.jar;lib/spring-security-crypto-5.7.3.jar;lib/bcprov-jdk15on-1.70.jar;lib/chesslib-1.1.1.jar;lib/htmlcompressor-1.5.2.jar;lib/yuicompressor-2.4.6.jar;lib/jsp-api-2.1.jar;lib/json-20090211.jar;lib/maven-plugin-api-3.0.3.jar;lib/activation-1.1.jar;lib/maxmind-db-1.2.2.jar;lib/jackson-databind-2.9.5.jar;lib/jackson-core-2.9.5.jar;lib/jackson-annotations-2.9.5.jar;lib/js-1.6R7.jar;lib/dom4j-1.1.jar;lib/oro-2.0.8.jar;lib/sslext-1.2-0.jar;lib/maven-model-3.0.3.jar;lib/maven-artifact-3.0.3.jar;lib/sisu-inject-plexus-2.1.1.jar;lib/antlr-2.7.2.jar;lib/plexus-utils-2.0.6.jar;lib/plexus-component-annotations-1.5.5.jar;lib/plexus-classworlds-2.4.jar;lib/sisu-inject-bean-2.1.1.jar;lib/sisu-guice-2.9.4-no_aop.jar + + +java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath "%CLASSPATH%" org.alexdev.http.HavanaWeb +pause \ No newline at end of file diff --git a/tools/scripts/run_web.sh b/tools/scripts/run_web.sh new file mode 100644 index 0000000..de225c2 --- /dev/null +++ b/tools/scripts/run_web.sh @@ -0,0 +1,5 @@ +#!/usr/bin/sh + +CLASSPATH=Havana-Web.jar:lib/ini4j-0.5.4.jar:lib/pebble-3.1.5.jar:lib/Havana-Server.jar:lib/HikariCP-3.4.1.jar:lib/mariadb-java-client-2.3.0.jar:lib/commons-configuration2-2.2.jar:lib/commons-text-1.5.jar:lib/htmlcompressor-maven-plugin-1.3.jar:lib/commons-io-2.5.jar:lib/velocity-tools-2.0.jar:lib/struts-taglib-1.3.8.jar:lib/struts-tiles-1.3.8.jar:lib/struts-core-1.3.8.jar:lib/commons-validator-1.6.jar:lib/geoip2-2.12.0.jar:lib/httpclient-4.5.5.jar:lib/duckHTTPD-all.jar:lib/jsoup-1.13.1.jar:lib/slf4j-log4j12-1.7.25.jar:lib/gson-2.8.0.jar:lib/mail-1.4.7.jar:lib/lazysodium-java-5.0.1.jar:lib/resource-loader-2.0.1.jar:lib/jna-5.8.0.jar:lib/unbescape-1.1.6.RELEASE.jar:lib/slf4j-api-1.7.30.jar:lib/commons-lang3-3.9.jar:lib/commons-chain-1.1.jar:lib/commons-digester-1.8.1.jar:lib/commons-beanutils-1.9.2.jar:lib/commons-logging-1.2.jar:lib/velocity-1.6.2.jar:lib/commons-collections-3.2.2.jar:lib/httpcore-4.4.9.jar:lib/commons-codec-1.10.jar:lib/netty-all-4.1.33.Final.jar:lib/log4j-1.2.17.jar:lib/commons-lang-2.6.jar:lib/spring-security-crypto-5.7.3.jar:lib/bcprov-jdk15on-1.70.jar:lib/chesslib-1.1.1.jar:lib/htmlcompressor-1.5.2.jar:lib/yuicompressor-2.4.6.jar:lib/jsp-api-2.1.jar:lib/json-20090211.jar:lib/maven-plugin-api-3.0.3.jar:lib/activation-1.1.jar:lib/maxmind-db-1.2.2.jar:lib/jackson-databind-2.9.5.jar:lib/jackson-core-2.9.5.jar:lib/jackson-annotations-2.9.5.jar:lib/js-1.6R7.jar:lib/dom4j-1.1.jar:lib/oro-2.0.8.jar:lib/sslext-1.2-0.jar:lib/maven-model-3.0.3.jar:lib/maven-artifact-3.0.3.jar:lib/sisu-inject-plexus-2.1.1.jar:lib/antlr-2.7.2.jar:lib/plexus-utils-2.0.6.jar:lib/plexus-component-annotations-1.5.5.jar:lib/plexus-classworlds-2.4.jar:lib/sisu-inject-bean-2.1.1.jar:lib/sisu-guice-2.9.4-no_aop.jar + +java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath $CLASSPATH org.alexdev.havana.Havana \ No newline at end of file