From 97385db5b5f5b606283fd2b1c404f7a815166c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 27 Jan 2019 20:13:06 +0900 Subject: [PATCH] Use yarn instead of npm on CircleCI --- .circleci/config.yml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54dff6c3e..6c064e0b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,18 +29,14 @@ jobs: executor: default steps: - checkout - - run: - name: Ensure package-lock.json - command: | - [ ! -e package-lock.json ] && echo '{}' > package-lock.json - restore_cache: name: Restore npm package caches keys: - - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}- - - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}- - - npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}- - - npm-v1-arch-{{ arch }}- - - npm-v1- + - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }} + - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}- + - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}- + - yarn-v1-arch-{{ arch }}- + - yarn-v1- - run: name: Install Dependencies command: | @@ -54,13 +50,13 @@ jobs: - run: name: Build command: | - node-gyp configure - node-gyp build - npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build) - ls -1ARl node_modules > ls + yarn install + yarn autoclean + yarn build + [ ! -e yarn.lock ] && touch yarn.lock - save_cache: name: Cache npm packages - key: npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}-ls-{{ checksum "ls" }} + key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }} paths: - node_modules # - store_artifacts: @@ -90,11 +86,11 @@ jobs: - run: name: Test command: | - npm run test - ls -1ARl node_modules > ls + yarn test + [ ! -e yarn.lock ] && touch yarn.lock - save_cache: name: Cache npm packages - key: npm-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "package-lock.json" }}-ls-{{ checksum "ls" }} + key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }} paths: - node_modules