Skip to content

Commit aa0ff37

Browse files
authored
Merge pull request #73 from lughino/chore/drop_node_8
chore(deps): remove node 8
2 parents ce7ea2c + 0bdaff4 commit aa0ff37

File tree

9 files changed

+3288
-6839
lines changed

9 files changed

+3288
-6839
lines changed

.circleci/config.yml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ lint: &lint
6969
at: .
7070
- run: npm run lint
7171

72-
node_8: &node_8
73-
docker:
74-
- image: circleci/node:8.17.0
75-
7672
node_10: &node_10
7773
docker:
7874
- image: circleci/node:10.22.0
@@ -81,12 +77,12 @@ node_12: &node_12
8177
docker:
8278
- image: circleci/node:12.18.3
8379

80+
node_14: &node_14
81+
docker:
82+
- image: circleci/node:14.15.3
83+
8484
version: 2
8585
jobs:
86-
prepare_8:
87-
working_directory: ~/project_8
88-
<<: *node_8
89-
<<: *prepare
9086
prepare_10:
9187
working_directory: ~/project_10
9288
<<: *node_10
@@ -95,10 +91,10 @@ jobs:
9591
working_directory: ~/project_12
9692
<<: *node_12
9793
<<: *prepare
98-
build_8:
99-
working_directory: ~/project_8
100-
<<: *node_8
101-
<<: *build
94+
prepare_14:
95+
working_directory: ~/project_14
96+
<<: *node_14
97+
<<: *prepare
10298
build_10:
10399
working_directory: ~/project_10
104100
<<: *node_10
@@ -107,10 +103,10 @@ jobs:
107103
working_directory: ~/project_12
108104
<<: *node_12
109105
<<: *build
110-
test_8:
111-
working_directory: ~/project_8
112-
<<: *node_8
113-
<<: *test
106+
build_14:
107+
working_directory: ~/project_14
108+
<<: *node_14
109+
<<: *build
114110
test_10:
115111
working_directory: ~/project_10
116112
<<: *node_10
@@ -119,10 +115,10 @@ jobs:
119115
working_directory: ~/project_12
120116
<<: *node_12
121117
<<: *test
122-
lint_8:
123-
working_directory: ~/project_8
124-
<<: *node_8
125-
<<: *lint
118+
test_14:
119+
working_directory: ~/project_14
120+
<<: *node_14
121+
<<: *test
126122
lint_10:
127123
working_directory: ~/project_10
128124
<<: *node_10
@@ -131,9 +127,13 @@ jobs:
131127
working_directory: ~/project_12
132128
<<: *node_12
133129
<<: *lint
130+
lint_14:
131+
working_directory: ~/project_14
132+
<<: *node_14
133+
<<: *lint
134134
code_cov_before:
135-
working_directory: ~/project_12
136-
<<: *node_12
135+
working_directory: ~/project_14
136+
<<: *node_14
137137
steps:
138138
- attach_workspace:
139139
at: .
@@ -142,8 +142,8 @@ jobs:
142142
command: |
143143
./cc-test-reporter before-build
144144
code_cov_after:
145-
working_directory: ~/project_12
146-
<<: *node_12
145+
working_directory: ~/project_14
146+
<<: *node_14
147147
steps:
148148
- attach_workspace:
149149
at: .
@@ -156,8 +156,8 @@ jobs:
156156
command: |
157157
./cc-test-reporter after-build --exit-code $? || true
158158
deploy:
159-
working_directory: ~/project_12
160-
<<: *node_12
159+
working_directory: ~/project_14
160+
<<: *node_14
161161
steps:
162162
- attach_workspace:
163163
at: .
@@ -168,17 +168,6 @@ workflows:
168168
version: 2
169169
build_and_deploy:
170170
jobs:
171-
- prepare_8
172-
- lint_8:
173-
requires:
174-
- prepare_8
175-
- test_8:
176-
requires:
177-
- prepare_8
178-
- build_8:
179-
requires:
180-
- test_8
181-
- lint_8
182171
- prepare_10
183172
- lint_10:
184173
requires:
@@ -191,9 +180,6 @@ workflows:
191180
- lint_10
192181
- test_10
193182
- prepare_12
194-
- code_cov_before:
195-
requires:
196-
- prepare_12
197183
- lint_12:
198184
requires:
199185
- prepare_12
@@ -204,14 +190,28 @@ workflows:
204190
requires:
205191
- lint_12
206192
- test_12
193+
- prepare_14
194+
- code_cov_before:
195+
requires:
196+
- prepare_14
197+
- lint_14:
198+
requires:
199+
- prepare_14
200+
- test_14:
201+
requires:
202+
- prepare_14
203+
- build_14:
204+
requires:
205+
- test_14
206+
- lint_14
207207
- code_cov_after:
208208
requires:
209-
- build_12
209+
- build_14
210210
- deploy:
211211
filters:
212212
branches:
213213
only:
214214
- master
215215
requires:
216-
- build_12
216+
- build_14
217217
- code_cov_after

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"jest": "readonly"
88
},
99
"parser": "@typescript-eslint/parser",
10-
"plugins": ["@typescript-eslint"],
11-
"extends": ["plugin:@typescript-eslint/recommended", "prettier", "prettier/@typescript-eslint"],
10+
"extends": ["plugin:@typescript-eslint/recommended", "prettier/@typescript-eslint", "plugin:prettier/recommended"],
1211
"parserOptions": {
1312
"project": "./tsconfig.json"
1413
},

config/cz-customizable/base.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ module.exports = {
2222
},
2323
{
2424
value: 'refactor',
25-
name:
26-
'refactor: A code change that neither fixes a bug nor adds a feature',
25+
name: 'refactor: A code change that neither fixes a bug nor adds a feature',
2726
},
2827
{
2928
value: 'test',

0 commit comments

Comments
 (0)