asd

3dea03cd · shirajuki · bbae3ef5 · 3dea03cd · 3dea03cd · 3dea03cd
Commit 3dea03cd authored 4 years ago by shirajuki
--- a/.gitignore
+++ b/.gitignore
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 image: node:14.16.0-alpine
 stages:
  - install
-  - build
+  - build_and_test
  - test
 variables:
@@ -24,29 +24,17 @@ install:
      - package-lock.json
 build:
-  stage: build
+  stage: build_and_test
-  artifacts:
-    paths:
-      - client/node_modules/
-      - server/node_modules/
  script:
    - npm build
 server_test:
-  stage: test
+  stage: build_and_test
-  artifacts:
-    paths:
-      - client/node_modules/
-      - server/node_modules/
  script:
    - cd server && npm test
 client_test:
-  stage: test
+  stage: build_and_test
-  artifacts:
-    paths:
-      - client/node_modules/
-      - server/node_modules/
  before_script:
    - apk add chromium
    - export CHROME_BIN=/usr/bin/chromium-browser

--- a/README.md
+++ b/README.md
--- a/client/.browserslistrc
+++ b/client/.browserslistrc
--- a/client/.editorconfig
+++ b/client/.editorconfig
--- a/client/.gitignore
+++ b/client/.gitignore
--- a/client/README.md
+++ b/client/README.md
--- a/client/angular.json
+++ b/client/angular.json
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
--- a/client/e2e/src/app.e2e-spec.ts
+++ b/client/e2e/src/app.e2e-spec.ts
--- a/client/e2e/src/app.po.ts
+++ b/client/e2e/src/app.po.ts
--- a/client/e2e/tsconfig.json
+++ b/client/e2e/tsconfig.json
--- a/client/karma.conf.js
+++ b/client/karma.conf.js
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
--- a/client/proxy.conf.json
+++ b/client/proxy.conf.json
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
--- a/client/src/app/app.component.spec.ts
+++ b/client/src/app/app.component.spec.ts