Fixed CI
This commit is contained in:
parent
b381a5b377
commit
2a1af9672f
@ -8,30 +8,30 @@ stages:
|
||||
cache:
|
||||
- key:
|
||||
files:
|
||||
- package-lock.json
|
||||
- yarn.lock
|
||||
paths:
|
||||
- node_modules
|
||||
- key:
|
||||
files:
|
||||
- frontend/package-lock.json
|
||||
- frontend/yarn.lock
|
||||
paths:
|
||||
- frontend/node_modules
|
||||
|
||||
before_script:
|
||||
- npm ci
|
||||
- yarn install
|
||||
- cd frontend
|
||||
- npm ci
|
||||
- yarn install
|
||||
|
||||
test_backend:
|
||||
stage: test
|
||||
script:
|
||||
- npm run lint
|
||||
- yarn lint
|
||||
|
||||
test_frontend:
|
||||
stage: test
|
||||
script:
|
||||
- cd frontend
|
||||
- npm run lint
|
||||
- yarn lint
|
||||
|
||||
build_backend:
|
||||
stage: build
|
||||
@ -39,7 +39,7 @@ build_backend:
|
||||
- job: test_backend
|
||||
artifacts: false
|
||||
script:
|
||||
- npm webpack
|
||||
- yarn webpack
|
||||
artifacts:
|
||||
paths:
|
||||
- dist/
|
||||
@ -52,7 +52,7 @@ build_frontend:
|
||||
artifacts: false
|
||||
script:
|
||||
- cd frontend
|
||||
- npm run lint
|
||||
- yarn build
|
||||
artifacts:
|
||||
paths:
|
||||
- frontend/dist/
|
||||
@ -72,6 +72,7 @@ package_server:
|
||||
- mkdir "$TMP/frontend"
|
||||
- mv frontend/dist/* "$TMP/frontend"
|
||||
- rm -r *
|
||||
- rm -r .*
|
||||
- mv "$TMP/*" .
|
||||
artifacts:
|
||||
paths:
|
||||
|
@ -1,4 +0,0 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"exclude": ["node_modules", "dist", "test", "**/*spec.ts", "frontend"]
|
||||
}
|
@ -12,5 +12,6 @@
|
||||
"baseUrl": "./",
|
||||
"incremental": true,
|
||||
"skipLibCheck": true
|
||||
}
|
||||
},
|
||||
"exclude": ["node_modules", "dist", "test", "**/*spec.ts", "frontend"]
|
||||
}
|
||||
|
@ -27,8 +27,8 @@ export default {
|
||||
transform: transform_package
|
||||
},
|
||||
{
|
||||
from: resolve(__dirname, 'package-lock.json'),
|
||||
to: resolve(__dirname, 'dist', 'package-lock.json')
|
||||
from: resolve(__dirname, 'yarn.lock'),
|
||||
to: resolve(__dirname, 'dist', 'yarn.lock')
|
||||
}
|
||||
]
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user