mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-23 21:22:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

MacOS release!

Browse Source
This commit is contained in:
yairm210 2021-08-22 22:49:49 +03:00
parent 949f45497e
commit fffedf9a70
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/buildAndDeploy.yml vendored
View File

@ -31,7 +31,6 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
# Don't upgrade to java 11 until you've managed to run packr with it.
with:
java-version: '11'
@ -127,6 +126,10 @@ jobs:
./gradlew desktop:packrWindows32
./butler push deploy/Unciv-Windows32.zip yairm210/unciv:Windows32 --userversion ${{steps.tag.outputs.tag}}
wget -q -O jre-macOS.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz
./gradlew desktop:packrMacOS
./butler push deploy/Unciv-MacOS.zip yairm210/unciv:MacOS --userversion ${{steps.tag.outputs.tag}}
wget -q -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip
./gradlew desktop:packrWindows64
./butler push deploy/Unciv-Windows64.zip yairm210/unciv:Windows64 --userversion ${{steps.tag.outputs.tag}}

10
desktop/build.gradle.kts
View File

@ -119,10 +119,14 @@ for(platform in PackrConfig.Platform.values()) {
if (config.outDir.exists()) delete(config.outDir)
// Requires that both packr and the linux jre are downloaded, as per buildAndDeploy.yml, "Upload to itch.io"
if (platform == PackrConfig.Platform.Linux64) {
if (platform == PackrConfig.Platform.Linux64 || platform == PackrConfig.Platform.MacOS) {
val jdkFile = if (platform == PackrConfig.Platform.Linux64) "jre-linux-64.tar.gz"
else "jre-macOS.tar.gz"
val platformNameForPackrCmd = if (platform == PackrConfig.Platform.Linux64) "linux64"
else "mac"
val command = "java -jar $rootDir/packr-all-4.0.0.jar" +
" --platform linux64" +
" --jdk jre-linux-64.tar.gz" +
" --platform $platformNameForPackrCmd" +
" --jdk $jdkFile" +
" --executable Unciv" +
" --classpath $jarFile" +
" --mainclass $mainClassName" +