From 8e85e8a963dbaf97cc20bd2296a2aa17e2e60661 Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 11 Oct 2018 04:13:14 +0200 Subject: [PATCH 1/4] Migrate circleci to version 2 --- .circleci/config.yml | 75 ++++++++++++++++++++++++++++++++++++++++++++ circle.yml | 16 ---------- 2 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..b3b15f10e --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,75 @@ +workflows: + version: 2 + node-multi-build: + jobs: + - node-v6 + - node-v8 + - node-v10 + - node-v10-minimal + +version: 2 +jobs: + node-base: &node-base + docker: + - image: node + steps: + - run: + name: Versions + command: npm version + - checkout + - restore_cache: + keys: + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }} + - run: + name: Install dependencies + command: npm install + - run: + name: Test + command: npm test + - save_cache: + key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + paths: + - node_modules + + node-v6: + <<: *node-base + docker: + - image: node:6 + node-v8: + <<: *node-base + docker: + - image: node:8 + node-v10: + <<: *node-base + docker: + - image: node:10 + node-v10-minimal: + steps: + - run: + name: Versions + command: npm version + - checkout + - restore_cache: + keys: + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} + - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }} + - run: + name: Install dependencies + command: npm install + - run: + name: Install eslint 5 + command: npm install eslint@5.0.0 --no-save + - run: + name: Test + command: npm test + - save_cache: + key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + paths: + - node_modules + docker: + - image: node:10 \ No newline at end of file diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 3d1494456..000000000 --- a/circle.yml +++ /dev/null @@ -1,16 +0,0 @@ -machine: - node: - version: 10 - -dependencies: - pre: - - nvm install 6 - - nvm install 8 - -test: - override: - - nvm use 6 && npm test - - nvm use 8 && npm test - - nvm use 10 && npm test - # Test for the minimum version we are supporting. - - nvm use 10 && npm i eslint@5.0.0 --no-save && $(npm bin)/mocha tests/lib/rules/*.js --reporter dot From dff5c383e01278ba49a08a953000d70db9efbf5b Mon Sep 17 00:00:00 2001 From: Armano Date: Thu, 11 Oct 2018 04:25:48 +0200 Subject: [PATCH 2/4] remove legacy eslint-plugin-html --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d5bc96733..df1f7c2b6 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "chai": "^4.1.0", "eslint": "^5.2.0", "eslint-plugin-eslint-plugin": "^1.4.0", - "eslint-plugin-html": "^4.0.1", "eslint-plugin-vue-libs": "^3.0.0", "lodash": "^4.17.4", "mocha": "^5.2.0", From e0533f0f9f8ff4058c68bc802fb2bc37cf4dea6d Mon Sep 17 00:00:00 2001 From: Armano Date: Sat, 13 Oct 2018 19:50:37 +0200 Subject: [PATCH 3/4] Update config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3b15f10e..61af99d71 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,4 +72,5 @@ jobs: paths: - node_modules docker: - - image: node:10 \ No newline at end of file + - image: node:10 + From b1efc821482d3d09e43f26e25677f87ff976873a Mon Sep 17 00:00:00 2001 From: Armano Date: Sat, 13 Oct 2018 20:04:51 +0200 Subject: [PATCH 4/4] Update config.yml --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61af99d71..75833b053 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,10 +19,10 @@ jobs: - checkout - restore_cache: keys: - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }} + - v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v2-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v2-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} + - v2-npm-cache-master-{{ .Environment.CIRCLE_JOB }} - run: name: Install dependencies command: npm install @@ -30,7 +30,7 @@ jobs: name: Test command: npm test - save_cache: - key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + key: v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} paths: - node_modules @@ -54,10 +54,10 @@ jobs: - checkout - restore_cache: keys: - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} - - v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-cache-master-{{ .Environment.CIRCLE_JOB }} + - v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v2-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + - v2-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }} + - v2-npm-cache-master-{{ .Environment.CIRCLE_JOB }} - run: name: Install dependencies command: npm install @@ -68,7 +68,7 @@ jobs: name: Test command: npm test - save_cache: - key: v{{ .Environment.CIRCLE_CACHE_VERSION }}-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} + key: v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }} paths: - node_modules docker: