Skip to content

Commit

Permalink
fix : ci
Browse files Browse the repository at this point in the history
  • Loading branch information
dlgocks1 committed Jun 20, 2024
1 parent 16014f7 commit e73cad7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
15 changes: 6 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,23 @@ node {
npmWorkDir = file("${project.buildDir}/npm")
}

tasks.register<Copy>("copyWebApp") {
dependsOn("appNpmBuild")
description = "Copies built project"
from("src/main/webapp/build")
into("build/resources/main/static/.")
}

tasks.register<NpmTask>("appNpmBuild") {
dependsOn("appNpmInstall")
description = "Builds project"
workingDir = file("${project.projectDir}/src/main/webapp")
args = listOf("run", "build-dev")
}

tasks.register<NpmTask>("appNpmInstall") {
description = "Installs all dependencies from package.json"
workingDir = file("${project.projectDir}/src/main/webapp")
args = listOf("install")
}

tasks.register<Copy>("copyWebApp") {
dependsOn("appNpmBuild")
from("src/main/webapp/build")
into("build/resources/main/static/.")
}

tasks.withType<Test> {
useJUnitPlatform()
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"build-prod": "dotenv -e .env.production react-scripts build",
"start-dev": "dotenv -e .env.development react-scripts start",
"start-prod": "dotenv -e .env.production react-scripts start",
"start-local": "dotenv -e .env.development.local react-scripts start",
"prepare": "husky install"
"start-local": "dotenv -e .env.development.local react-scripts start"
},
"dependencies": {
"@coreui/coreui": "4.2.6",
Expand Down Expand Up @@ -66,7 +65,6 @@
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-prettier": "^4.2.1",
"husky": "^8.0.3",
"lint-staged": "^13.2.2",
"prettier": "^2.8.8",
"react-scripts": "5.0.1",
Expand Down

0 comments on commit e73cad7

Please sign in to comment.