Develop->main #2

Merged
Liosha84 merged 2 commits from develop into master 2026-10-29 00:43:37 +01:00
Showing only changes of commit 0d6e0fa565 - Show all commits
+5 -3
View File
@@ -35,7 +35,11 @@ def frontendDir = file('../frontend')
def frontendDistDir = file('../frontend/dist/frontend/browser') def frontendDistDir = file('../frontend/dist/frontend/browser')
def springStaticDir = file('src/main/resources/static') def springStaticDir = file('src/main/resources/static')
// Skip frontend build tasks when building inside Docker (frontend already built in Stage 1)
def skipFrontend = project.hasProperty('skipFrontend') || System.getenv('SKIP_FRONTEND') != null
tasks.register('installFrontendDependencies', Exec) { tasks.register('installFrontendDependencies', Exec) {
onlyIf { !skipFrontend }
workingDir frontendDir workingDir frontendDir
inputs.file(file('../frontend/package.json')) inputs.file(file('../frontend/package.json'))
@@ -50,6 +54,7 @@ tasks.register('installFrontendDependencies', Exec) {
} }
tasks.register('buildFrontend', Exec) { tasks.register('buildFrontend', Exec) {
onlyIf { !skipFrontend }
dependsOn 'installFrontendDependencies' dependsOn 'installFrontendDependencies'
workingDir frontendDir workingDir frontendDir
@@ -66,9 +71,6 @@ tasks.register('buildFrontend', Exec) {
} }
} }
// Skip frontend build tasks when building inside Docker (frontend already built in Stage 1)
def skipFrontend = project.hasProperty('skipFrontend') || System.getenv('SKIP_FRONTEND') != null
tasks.register('copyFrontend', Copy) { tasks.register('copyFrontend', Copy) {
onlyIf { !skipFrontend } onlyIf { !skipFrontend }
dependsOn 'buildFrontend' dependsOn 'buildFrontend'