Skip to content

Commit

Permalink
chore(deps): update defaults (#870)
Browse files Browse the repository at this point in the history
  • Loading branch information
evilebottnawi committed Dec 12, 2018
1 parent 8c0bb58 commit 503391f
Show file tree
Hide file tree
Showing 5 changed files with 269 additions and 157 deletions.
50 changes: 25 additions & 25 deletions .circleci/config.yml
Expand Up @@ -50,6 +50,28 @@ jobs:
key: dependency-cache-{{ checksum "package-lock.json" }}
paths:
- ./node_modules
analysis:
docker:
- image: webpackcontrib/circleci-node-base:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: Install Latest NPM.
command: npm i -g npm@latest
- run:
name: NPM Install.
command: npm ci
- run:
name: Run linting.
command: npm run lint
- run:
name: Run NPM Audit.
command: npm run security
- run:
name: Validate Commit Messages.
command: npm run ci:lint:commits
node6-latest:
docker:
- image: webpackcontrib/circleci-node6:latest
Expand Down Expand Up @@ -78,32 +100,10 @@ jobs:
name: Submit coverage data to codecov.
command: bash <(curl -s https://codecov.io/bash)
when: on_success
node10-canary:
node6-canary:
docker:
- image: webpackcontrib/circleci-node10:latest
<<: *canary_tests
analysis:
docker:
- image: webpackcontrib/circleci-node-base:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: Install Latest NPM.
command: npm i -g npm@latest
- run:
name: NPM Install.
command: npm ci
- run:
name: Run linting.
command: npm run lint
- run:
name: Run NPM Audit.
command: npm run security
- run:
name: Validate Commit Messages.
command: npm run ci:lint:commits

workflows:
version: 2
Expand Down Expand Up @@ -136,10 +136,10 @@ workflows:
filters:
tags:
only: /.*/
- node10-canary:
- node6-canary:
requires:
- analysis
- node6-latest
filters:
tags:
only: /.*/
only: /.*/
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -9,5 +9,5 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
insert_final_newline = false
insert_final_newline = true
trim_trailing_whitespace = false
13 changes: 6 additions & 7 deletions appveyor.yml
Expand Up @@ -9,20 +9,20 @@ cache:
- '%APPDATA%\npm-cache'
environment:
matrix:
- nodejs_version: '11'
- nodejs_version: '6'
webpack_version: latest
job_part: test
- nodejs_version: '10'
- nodejs_version: '8'
webpack_version: latest
job_part: test
- nodejs_version: '8'
- nodejs_version: '10'
webpack_version: latest
job_part: test
- nodejs_version: '6'
- nodejs_version: '11'
webpack_version: latest
job_part: test
- nodejs_version: '6'
webpack_version: latest
webpack_version: next
job_part: next
build: 'off'
matrix:
Expand All @@ -35,8 +35,7 @@ install:
before_test:
- cmd: npm install webpack@%webpack_version%
test_script:
- node --version
- node --version
- npm --version
- cmd: FOR /F %%I in ('compver --name webpack --gte %webpack_version% --lt latest') do SET COMPARED_VERSION_RESULT=%%I
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:test) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:%job_part%) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")

0 comments on commit 503391f

Please sign in to comment.