diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abee027..1bd4430 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,12 +60,12 @@ jobs: **/react/node_modules 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 with: build-root-directory: master wrapper-directory: master - arguments: :server:windowsPackage --stacktrace + arguments: :webUI:copyBuild :server:windowsPackage --stacktrace wrapper-cache-enabled: true dependencies-cache-enabled: true configuration-cache-enabled: true \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d0ccaac..4adf668 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -58,12 +58,12 @@ jobs: **/react/node_modules 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 with: build-root-directory: master wrapper-directory: master - arguments: :server:windowsPackage --stacktrace + arguments: :webUI:copyBuild :server:windowsPackage --stacktrace wrapper-cache-enabled: true dependencies-cache-enabled: true configuration-cache-enabled: true diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 1de6806..11adada 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -196,11 +196,7 @@ tasks.register("downloadJre") { tasks.withType { destinationDir = File("$rootDir/server/build") - dependsOn("lintKotlin") -} - -tasks.named("processResources") { - dependsOn(":webUI:copyBuild") + dependsOn("formatKotlin", "lintKotlin") } tasks.named("run") {