Yuki Takei 6 лет назад
Родитель
Сommit
cf6f96fb37
1 измененных файлов с 16 добавлено и 20 удалено
  1. 16 20
      .github/workflows/test.yml

+ 16 - 20
.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
         yarn list --depth=0
 
 
-  lint:
+  test:
     runs-on: ubuntu-latest
     needs: resolve-dependencies
 
@@ -49,6 +49,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Cache/Restore node_modules
       uses: actions/cache@v1
       with:
@@ -59,22 +63,6 @@ jobs:
       run: |
         yarn lint
 
-
-  test:
-    runs-on: ubuntu-latest
-    needs: resolve-dependencies
-
-    strategy:
-      matrix:
-        node-version: [10.x, 12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Cache/Restore node_modules
-      uses: actions/cache@v1
-      with:
-        path: node_modules
-        key: ${{ runner.OS }}-node_modules-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
     - name: Launch MongoDB
       uses: wbari/start-mongoDB@v0.2
       with:
@@ -96,6 +84,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Cache/Restore node_modules
       uses: actions/cache@v1
       with:
@@ -116,10 +108,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Launch MongoDB
-      uses: wbari/start-mongoDB@v0.2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
       with:
-        mongoDBVersion: 3.6
+        node-version: ${{ matrix.node-version }}
     - name: Cache/Restore node_modules
       uses: actions/cache@v1
       with:
@@ -128,6 +120,10 @@ jobs:
         restore-keys: |
           ${{ runner.OS }}-node_modules-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
           ${{ runner.OS }}-node_modules-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}-build-prod
+    - name: Launch MongoDB
+      uses: wbari/start-mongoDB@v0.2
+      with:
+        mongoDBVersion: 3.6
     - name: yarn build:prod:analyze
       run: |
         yarn build:prod:analyze