Skip to content

Commit

Permalink
Merge branch 'release-1.11.0' into logger-to-npm
Browse files Browse the repository at this point in the history
* release-1.11.0:
  Update snyk policy on Hoek warning
  Re-add Synk lib
  Restore package deps to 1.11 version
  Update preset-env version causing test error
  Update snyk policy on Hoek warning
  Add package-lock changes
  Bump reaction/base version to 4.0.2
  Update snyk policy on Hoek warning
  Update Path to use proper env
  Add Snyk job to CircleCI
  Add Snyk to package.json

# Conflicts:
#	package-lock.json
  • Loading branch information
jshimko committed Apr 4, 2018
2 parents d032bf7 + 0bfe62a commit 1be253f
Show file tree
Hide file tree
Showing 5 changed files with 2,129 additions and 412 deletions.
21 changes: 21 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,23 @@ jobs:
name: Dockerfile Lint
command: |
hadolint Dockerfile
snyk-security:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- restore_cache:
keys:
- v1-node-modules-{{ checksum "package.json" }}
- v1-node-modules-{{ .Branch }}
- v1-node-modules-master
- run:
name: Snyk Test
command: |
PATH=$PATH:$CIRCLE_WORKING_DIRECTORY/node_modules/.bin && \
snyk test
workflows:
version: 2
build_and_test:
Expand Down Expand Up @@ -233,3 +250,7 @@ workflows:
filters:
branches:
only: /^master$/
- snyk-security:
context: reaction-validation
requires:
- build
Loading

0 comments on commit 1be253f

Please sign in to comment.