fixed circle, removed node 6 for now...

dragoscirjan · Mar 25, 2019 · e05ff42 · e05ff42
1 parent f3d9225
commit e05ff42
Showing 1 changed file with 23 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,54 +8,34 @@ commands:
       - run:
           name: Versions
           command: npm version
-      # - checkout
-      # - restore_cache:
-      #     keys:
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
-      - run:
-          name: Install dependencies
-          command: npm install
-      - run:
-          name: Install gulp cli
-          command: npm install -D gulp-cli
-      - run:
-          name: Lint
-          command: gulp lint
-      - run:
-          name: Build
-          command: gulp lint
-      # - run:
-      #     name: Test
-      #     command: gulp test
+      - checkout
+      - restore_cache:
+          keys:
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
+      - run: npm install
+      - run: npm install -D gulp-cli @babel/core
+      - run: ./node_modules/.bin/gulp lint
+      - run: ./node_modules/.bin/gulp
+      # - run: ./node_modules/.bin/gulp test
       - save-npm-cache
   test-nodejs-v6:
     steps:
       - run:
           name: Versions
           command: npm version
-      # - checkout
-      # - restore_cache:
-      #     keys:
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
-      #       - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
-      - run:
-          name: Install dependencies
-          command: npm install
-      - run:
-          name: Install gulp cli
-          command: npm install -D gulp-cli
-      - run:
-          name: Lint
-          command: gulp lint
-      - run:
-          name: Build
-          command: gulp lint
-      # - run:
-      #     name: Test
-      #     command: gulp test
+      - checkout
+      - restore_cache:
+          keys:
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
+            - v{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ arch }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
+      - run: npm install
+      - run: npm install -D gulp-cli @babel/core
+      - run: ./node_modules/.bin/gulp lint
+      - run: ./node_modules/.bin/gulp
+      # - run: ./node_modules/.bin/gulp test
       - save-npm-lock
       - save-npm-cache
   save-npm-lock:
@@ -102,7 +82,7 @@ jobs:
 workflows:
   node-multi-build:
     jobs:
-      - node-v6
+      # - node-v6
       - node-v8
       - node-v10
       - node-v11