From 03779e0ed36708be421cf1949016a243cf0cdb81 Mon Sep 17 00:00:00 2001
From: "Xin Du (Clark)" <clark.duxin@gmail.com>
Date: Thu, 20 Dec 2018 16:41:50 +0000
Subject: [PATCH] ci: update main.workflow

[skip ci]
---
 .github/{main.workflow.bak => main.workflow} | 37 +++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)
 rename .github/{main.workflow.bak => main.workflow} (50%)

diff --git a/.github/main.workflow.bak b/.github/main.workflow
similarity index 50%
rename from .github/main.workflow.bak
rename to .github/main.workflow
index 6841c63fe6..8f5212a169 100644
--- a/.github/main.workflow.bak
+++ b/.github/main.workflow
@@ -1,51 +1,38 @@
 workflow "Nuxt.js Actions" {
   on = "push"
-  resolves = ["Npm Audit", "Lint", "Test: E2E", "Coverage: Unit"]
+  resolves = ["Audit", "Lint", "Test: Unit", "Test: E2E"]
 }
 
 action "Install" {
   uses = "nuxt/actions-yarn@master"
-  args = "install"
+  args = "install --frozen-lockfile --non-interactive"
 }
 
 action "Lint" {
   uses = "nuxt/actions-yarn@master"
-  needs = ["Install"]
   args = "lint"
 }
 
+action "Audit" {
+  uses = "nuxt/actions-yarn@master"
+  needs = ["Install"]
+  args = "audit"
+}
+
 action "Build" {
   uses = "nuxt/actions-yarn@master"
   needs = ["Install"]
-  args = "test:fixtures"
-}
-
-action "Npm Audit" {
-  uses = "actions/npm@e7aaefe"
-  needs = ["Install"]
-  args = "audit --audit-level=moderate"
-}
-
-action "Coverage: Build" {
-  uses = "nuxt/actions-yarn@master"
-  needs = ["Build"]
-  args = "coverage"
+  runs = "yarn test:fixtures --coverage && yarn coverage"
 }
 
 action "Test: Unit" {
   uses = "nuxt/actions-yarn@master"
-  args = "test:unit"
-  needs = ["Coverage: Build"]
+  needs = ["Build"]
+  runs = "yarn test:unit --coverage && yarn coverage"
 }
 
 action "Test: E2E" {
   uses = "nuxt/actions-yarn@master"
   args = "test:e2e"
-  needs = ["Coverage: Build"]
-}
-
-action "Coverage: Unit" {
-  uses = "nuxt/actions-yarn@master"
-  needs = ["Test: Unit"]
-  args = "coverage"
+  needs = ["Build"]
 }