Merge branch 'master' into 4.x

This commit is contained in:
Juan Picado @jotadeveloper 2018-11-17 12:17:58 +01:00 committed by GitHub
commit 3dd7dcd53c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

@ -29,9 +29,8 @@ aliases:
- &yarn_cache_key - &yarn_cache_key
yarn-sha-{{ checksum "yarn.lock" }} yarn-sha-{{ checksum "yarn.lock" }}
- &restore_repo - &restore_repo
restore_cache: attach_workspace:
keys: at: ~/verdaccio
- *repo_key
- &ignore_non_dev_branches - &ignore_non_dev_branches
filters: filters:
tags: tags:
@ -54,7 +53,6 @@ jobs:
<<: *defaults <<: *defaults
<<: *default_executor <<: *default_executor
steps: steps:
- *restore_repo
- checkout - checkout
- restore_cache: - restore_cache:
key: *base_config_key key: *base_config_key
@ -88,10 +86,10 @@ jobs:
- ~/.yarn - ~/.yarn
- ~/.cache/yarn - ~/.cache/yarn
- node_modules - node_modules
- save_cache: - persist_to_workspace:
key: *repo_key root: ~/verdaccio
paths: paths:
- ~/verdaccio - ./*
test_node6: test_node6:
<<: *defaults <<: *defaults
@ -153,6 +151,8 @@ jobs:
<<: *default_executor <<: *default_executor
steps: steps:
- *restore_repo - *restore_repo
- restore_cache:
key: *base_config_key
- run: - run:
name: Test size name: Test size
command: yarn test:size command: yarn test:size