Matt 5 år sedan
förälder
incheckning
85906cafbb
1 ändrade filer med 6 tillägg och 16 borttagningar
  1. 6 16
      .github/workflows/main.yml

+ 6 - 16
.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Test & Deploy
 
 
 on: [push]
 on: [push]
 
 
@@ -12,29 +12,19 @@ jobs:
     - name: Setup
     - name: Setup
       run: |
       run: |
         npm i
         npm i
-        npm i -g grunt
         export NODE_OPTIONS=--max_old_space_size=2048
         export NODE_OPTIONS=--max_old_space_size=2048
     - name: Lint
     - name: Lint
-      run: grunt lint
+      run: npx grunt lint
     - name: Unit Tests
     - name: Unit Tests
       run: |
       run: |
-        grunt test
-        grunt testnodeconsumer
+        npx grunt test
+        npx grunt testnodeconsumer
     - name: UI Tests
     - name: UI Tests
-      run: xvfb-run --server-args="-screen 0 1200x800x24" grunt testui
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup
-      run: |
-        npm i
-        npm i -g grunt
-        export NODE_OPTIONS=--max_old_space_size=2048
+      run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
     - name: Build & Deploy
     - name: Build & Deploy
       uses: JamesIves/github-pages-deploy-action@master
       uses: JamesIves/github-pages-deploy-action@master
       env:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BRANCH: gh-pages
         BRANCH: gh-pages
         FOLDER: build/prod
         FOLDER: build/prod
-        BUILD_SCRIPT: grunt prod
+        BUILD_SCRIPT: npx grunt prod