Skip to content

Commit 503391f

Browse files
authoredDec 12, 2018
chore(deps): update defaults (#870)
1 parent 8c0bb58 commit 503391f

File tree

5 files changed

+269
-157
lines changed

5 files changed

+269
-157
lines changed
 

‎.circleci/config.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,28 @@ jobs:
5050
key: dependency-cache-{{ checksum "package-lock.json" }}
5151
paths:
5252
- ./node_modules
53+
analysis:
54+
docker:
55+
- image: webpackcontrib/circleci-node-base:latest
56+
steps:
57+
- checkout
58+
- restore_cache:
59+
key: dependency-cache-{{ checksum "package-lock.json" }}
60+
- run:
61+
name: Install Latest NPM.
62+
command: npm i -g npm@latest
63+
- run:
64+
name: NPM Install.
65+
command: npm ci
66+
- run:
67+
name: Run linting.
68+
command: npm run lint
69+
- run:
70+
name: Run NPM Audit.
71+
command: npm run security
72+
- run:
73+
name: Validate Commit Messages.
74+
command: npm run ci:lint:commits
5375
node6-latest:
5476
docker:
5577
- image: webpackcontrib/circleci-node6:latest
@@ -78,32 +100,10 @@ jobs:
78100
name: Submit coverage data to codecov.
79101
command: bash <(curl -s https://codecov.io/bash)
80102
when: on_success
81-
node10-canary:
103+
node6-canary:
82104
docker:
83105
- image: webpackcontrib/circleci-node10:latest
84106
<<: *canary_tests
85-
analysis:
86-
docker:
87-
- image: webpackcontrib/circleci-node-base:latest
88-
steps:
89-
- checkout
90-
- restore_cache:
91-
key: dependency-cache-{{ checksum "package-lock.json" }}
92-
- run:
93-
name: Install Latest NPM.
94-
command: npm i -g npm@latest
95-
- run:
96-
name: NPM Install.
97-
command: npm ci
98-
- run:
99-
name: Run linting.
100-
command: npm run lint
101-
- run:
102-
name: Run NPM Audit.
103-
command: npm run security
104-
- run:
105-
name: Validate Commit Messages.
106-
command: npm run ci:lint:commits
107107

108108
workflows:
109109
version: 2
@@ -136,10 +136,10 @@ workflows:
136136
filters:
137137
tags:
138138
only: /.*/
139-
- node10-canary:
139+
- node6-canary:
140140
requires:
141141
- analysis
142142
- node6-latest
143143
filters:
144144
tags:
145-
only: /.*/
145+
only: /.*/

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]
12-
insert_final_newline = false
12+
insert_final_newline = true
1313
trim_trailing_whitespace = false

‎appveyor.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ cache:
99
- '%APPDATA%\npm-cache'
1010
environment:
1111
matrix:
12-
- nodejs_version: '11'
12+
- nodejs_version: '6'
1313
webpack_version: latest
1414
job_part: test
15-
- nodejs_version: '10'
15+
- nodejs_version: '8'
1616
webpack_version: latest
1717
job_part: test
18-
- nodejs_version: '8'
18+
- nodejs_version: '10'
1919
webpack_version: latest
2020
job_part: test
21-
- nodejs_version: '6'
21+
- nodejs_version: '11'
2222
webpack_version: latest
2323
job_part: test
2424
- nodejs_version: '6'
25-
webpack_version: latest
25+
webpack_version: next
2626
job_part: next
2727
build: 'off'
2828
matrix:
@@ -35,8 +35,7 @@ install:
3535
before_test:
3636
- cmd: npm install webpack@%webpack_version%
3737
test_script:
38-
- node --version
3938
- node --version
4039
- npm --version
4140
- cmd: FOR /F %%I in ('compver --name webpack --gte %webpack_version% --lt latest') do SET COMPARED_VERSION_RESULT=%%I
42-
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:test) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")
41+
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:%job_part%) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")

0 commit comments

Comments
 (0)