Use proper cl gradle.properties

This commit is contained in:
Syer10
2021-06-06 17:24:25 -04:00
parent d042bac708
commit cbcfc5d92b
6 changed files with 42 additions and 2 deletions

View File

@@ -0,0 +1,7 @@
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx5120m
org.gradle.workers.max=5
org.gradle.parallel=true
kotlin.incremental=false
kotlin.compiler.execution.strategy=in-process

View File

@@ -12,7 +12,7 @@ jobs:
name: Build application packages
strategy:
matrix:
runtime: [ linux-x64, osx-x64, win-x64 ]
runtime: [ linux-x64, linux-centos-x64, osx-x64, win-x64 ]
include:
- runtime: linux-x64
arch: x64
@@ -20,6 +20,7 @@ jobs:
shell: bash
buildPackage: ./scripts/BuildLinuxDeb.sh
buildJar: ./scripts/BuildUnixJar.sh
setupCl: ./scripts/SetupClUnix.sh
- runtime: linux-centos-x64
arch: x64
@@ -27,6 +28,7 @@ jobs:
shell: bash
buildPackage: ./scripts/BuildLinuxRpm.sh
buildJar: ./scripts/BuildUnixJar.sh
setupCl: ./scripts/SetupClUnix.sh
- runtime: osx-x64
arch: x64
@@ -34,6 +36,7 @@ jobs:
shell: bash
buildPackage: ./scripts/BuildMacDmg.sh
buildJar: ./scripts/BuildUnixJar.sh
setupCl: ./scripts/SetupClUnix.sh
- runtime: win-x64
arch: x64
@@ -41,6 +44,7 @@ jobs:
shell: powershell
buildPackage: ./scripts/BuildWindowsMsi.ps1
buildJar: ./scripts/BuildWindowsJar.ps1
setupCl: ./scripts/SetupClWindows.ps1
runs-on: ${{ matrix.os }}
defaults:
@@ -55,6 +59,9 @@ jobs:
java-version: '15'
architecture: ${{ matrix.arch }}
- name: Setup Cl
run: ${{ matrix.setupCl }}
- name: Build Package
if: ${{ matrix.runtime != 'linux-centos-x64' && matrix.runtime != 'osx-x64' }}
run: ${{ matrix.buildPackage }}

7
scripts/SetupClUnix.sh Normal file
View File

@@ -0,0 +1,7 @@
if [ "$(basename "$(pwd)")" = "scripts" ]; then
cd ..
fi
echo "Writing ci gradle.properties"
[ ! -d "/path/to/dir" ] && mkdir ".gradle"
cp ".github/runner-files/ci-gradle.properties" ".gradle/gradle.properties"

View File

@@ -0,0 +1,9 @@
if ($(Split-Path -Path (Get-Location) -Leaf) -eq "scripts" ) {
Set-Location ..
}
Write-Output "Writing ci gradle.properties"
if (!(Test-Path -Path ".gradle")) {
New-Item -ItemType Directory -Force -Path ".gradle" -ErrorAction SilentlyContinue
}
Copy-Item ".github/runner-files/ci-gradle.properties" ".gradle/gradle.properties" -Force

View File

@@ -21,6 +21,10 @@ pushd "$TACHIDESK_FOLDER" || exit
echo "Setting up android.jar"
AndroidCompat/getAndroid.sh
echo "Writing ci gradle.properties"
[ ! -d "/path/to/dir" ] && mkdir ".gradle"
cp ".github/runner-files/ci-gradle.properties" ".gradle/gradle.properties"
echo "Building Tachidesk.jar"
./gradlew :server:shadowJar -x :webUI:copyBuild

View File

@@ -21,6 +21,12 @@ Push-Location $tachidesk_folder.FullName
Write-Output "Setting up android.jar"
&"./AndroidCompat/getAndroid.ps1"
Write-Output "Writing ci gradle.properties"
if (!(Test-Path -Path ".gradle")) {
New-Item -ItemType Directory -Force -Path ".gradle" -ErrorAction SilentlyContinue
}
Copy-Item ".github/runner-files/ci-gradle.properties" ".gradle/gradle.properties" -Force
Write-Output "Building Tachidesk.jar"
&"./gradlew" :server:shadowJar -x :webUI:copyBuild