Browse Source

update ci settings

Yuki Takei 4 years ago
parent
commit
f5194c98a4
3 changed files with 7 additions and 8 deletions
  1. 3 6
      .github/workflows/ci.yml
  2. 2 0
      packages/app/config/ci/.env.local.for-ci
  3. 2 2
      packages/app/package.json

+ 3 - 6
.github/workflows/ci.yml

@@ -203,14 +203,11 @@ jobs:
         echo -n "node " && node -v
         echo -n "npm " && npm -v
         yarn list --depth=0
-    - name: Build
-      working-directory: ./packages/app
-      run: |
-        yarn dev:ci:client
-    - name: yarn dev:ci:server
+    - name: yarn dev:ci
       working-directory: ./packages/app
       run: |
-        yarn dev:ci:server
+        cp config/ci/.env.local.for-ci .env.local
+        yarn dev:ci
       env:
         MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_dev
 

+ 2 - 0
packages/app/config/ci/.env.local.for-ci

@@ -0,0 +1,2 @@
+# disable Elasticsearch
+ELASTICSEARCH_URI=

+ 2 - 2
packages/app/package.json

@@ -13,9 +13,9 @@
     "server:ci": "yarn server --ci",
     "dev": "run-p dev:client dev:server",
     "dev:client": "cross-env NODE_ENV=development webpack --config config/webpack.dev.js --progress --watch",
+    "dev:client:nowatch": "cross-env NODE_ENV=development webpack --config config/webpack.dev.js",
     "dev:server": "cross-env NODE_ENV=development yarn ts-node-dev src/server/app.ts --expose_gc --inspect",
-    "dev:ci:client": "cross-env NODE_ENV=development webpack --config config/webpack.dev.js",
-    "dev:ci:server": "cross-env NODE_ENV=development yarn ts-node src/server/app.ts --ci",
+    "dev:ci": "yarn dev:client:nowatch && yarn dev:server --ci",
     "predev:client": "run-p resources:*",
     "predev:ci:client": "run-p resources:*",
     "resources:plugin": "yarn ts-node bin/generate-plugin-definitions-source.ts",