separate jar task from webUI copy task

This commit is contained in:
Aria Moradi 2021-03-30 20:14:25 +04:30
parent caeb4d273d
commit 5b9219522d
3 changed files with 5 additions and 9 deletions

View File

@ -60,12 +60,12 @@ jobs:
**/react/node_modules **/react/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
- name: Build Jar and launch4j - name: Build and copy webUI, Build Jar and launch4j
uses: eskatos/gradle-command-action@v1 uses: eskatos/gradle-command-action@v1
with: with:
build-root-directory: master build-root-directory: master
wrapper-directory: master wrapper-directory: master
arguments: :server:windowsPackage --stacktrace arguments: :webUI:copyBuild :server:windowsPackage --stacktrace
wrapper-cache-enabled: true wrapper-cache-enabled: true
dependencies-cache-enabled: true dependencies-cache-enabled: true
configuration-cache-enabled: true configuration-cache-enabled: true

View File

@ -58,12 +58,12 @@ jobs:
**/react/node_modules **/react/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- name: Build Jar and launch4j - name: Build and copy webUI, Build Jar and launch4j
uses: eskatos/gradle-command-action@v1 uses: eskatos/gradle-command-action@v1
with: with:
build-root-directory: master build-root-directory: master
wrapper-directory: master wrapper-directory: master
arguments: :server:windowsPackage --stacktrace arguments: :webUI:copyBuild :server:windowsPackage --stacktrace
wrapper-cache-enabled: true wrapper-cache-enabled: true
dependencies-cache-enabled: true dependencies-cache-enabled: true
configuration-cache-enabled: true configuration-cache-enabled: true

View File

@ -196,11 +196,7 @@ tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadJre") {
tasks.withType<ShadowJar> { tasks.withType<ShadowJar> {
destinationDir = File("$rootDir/server/build") destinationDir = File("$rootDir/server/build")
dependsOn("lintKotlin") dependsOn("formatKotlin", "lintKotlin")
}
tasks.named("processResources") {
dependsOn(":webUI:copyBuild")
} }
tasks.named("run") { tasks.named("run") {