From 96c15cb90aeec7e3b6b7fbbe68606d587101474c Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Sun, 30 Apr 2017 00:45:19 +0200
Subject: [PATCH] update ci

---
 .gitlab-ci.yml | 26 ++++++++++++++++++++++----
 npmextra.json  |  5 +++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f45ed3..56a2530 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,31 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
+
 stages:
 - test
 - release
 - trigger
 - pages
+
 testLEGACY:
   stage: test
   script:
     - npmci test legacy
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
   allow_failure: true
+
 testLTS:
   stage: test
   script:
     - npmci test lts
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
     
@@ -22,8 +33,10 @@ testSTABLE:
   stage: test
   script:
     - npmci test stable
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
+
 release:
   stage: release
   script:
@@ -32,6 +45,7 @@ release:
     - tags
   tags:
     - docker
+
 trigger:
   stage: trigger
   script:
@@ -40,14 +54,18 @@ trigger:
     - tags
   tags:
     - docker
+
 pages:
-  image: hosttoday/ht-docker-node:npmpage
+  image: hosttoday/ht-docker-node:npmci
   stage: pages
   script:
-    - npmci command npmpage --host gitlab
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
+  tags:
+    - docker
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
-    - public
\ No newline at end of file
+    - public
diff --git a/npmextra.json b/npmextra.json
index 916763c..a15880e 100644
--- a/npmextra.json
+++ b/npmextra.json
@@ -1,5 +1,10 @@
 {
   "npmts": {
     "mode": "default"
+  },
+  "npmci": {
+    "globalNpmTools": [
+      "npmts"
+    ]
   }
 }
\ No newline at end of file