Skip to content

Commit

Permalink
ci: ci fix
Browse files Browse the repository at this point in the history
cache is keyed by package-lock, and audit_dependencies restore it
  • Loading branch information
rcmedeiros committed Oct 28, 2019
1 parent 456db33 commit d87ec4d
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions .circleci/config.yml
Expand Up @@ -23,14 +23,14 @@ jobs:
steps:
- checkout
- restore_cache:
key: dependencies-{{ checksum "package.json" }}
key: dependencies-{{ checksum "package-lock.json" }}
- run:
name: Install production dependencies
command: |
chmod +x .circleci/install.sh
./.circleci/install.sh
- save_cache:
key: dependencies-{{ checksum "package.json" }}
key: dependencies-{{ checksum "package-lock.json" }}
paths:
- node_modules

Expand All @@ -40,14 +40,14 @@ jobs:
steps:
- checkout
- restore_cache:
key: dev_dependencies-{{ checksum "package.json" }}
key: dev_dependencies-{{ checksum "package-lock.json" }}
- run:
name: Install development dependencies
command: |
chmod +x .circleci/install.sh
./.circleci/install.sh dev
- save_cache:
key: dev_dependencies-{{ checksum "package.json" }}
key: dev_dependencies-{{ checksum "package-lock.json" }}
paths:
- node_modules

Expand Down Expand Up @@ -83,6 +83,10 @@ jobs:
- image: circleci/node:10
steps:
- checkout
- restore_cache:
key: dependencies-{{ checksum "package-lock.json" }}
- restore_cache:
key: dev_dependencies-{{ checksum "package-lock.json" }}
- run:
name: Check for outdated packages
command: npm outdated
Expand All @@ -102,9 +106,9 @@ jobs:
steps:
- checkout
- restore_cache:
key: dependencies-{{ checksum "package.json" }}
key: dependencies-{{ checksum "package-lock.json" }}
- restore_cache:
key: dev_dependencies-{{ checksum "package.json" }}
key: dev_dependencies-{{ checksum "package-lock.json" }}
- run:
name: Run TSLint
command: |
Expand All @@ -124,7 +128,7 @@ jobs:
steps:
- checkout
- restore_cache:
key: dev_dependencies-{{ checksum "package.json" }}
key: dev_dependencies-{{ checksum "package-lock.json" }}
- when:
condition: << parameters.production >>
steps:
Expand Down Expand Up @@ -158,10 +162,10 @@ jobs:
- checkout
- restore_cache:
name: Restore Development Dependencies
key: dev_dependencies-{{ checksum "package.json" }}
key: dev_dependencies-{{ checksum "package-lock.json" }}
- restore_cache:
name: Restore Dependencies
key: dependencies-{{ checksum "package.json" }}
key: dependencies-{{ checksum "package-lock.json" }}
- run:
name: Run Tests!
command: |
Expand Down

0 comments on commit d87ec4d

Please sign in to comment.