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