Skip to content

Commit 42eae25

Browse files
Merge pull request nodejs#730 from nodejs/editorocnfig
Introduce EditorConfig
2 parents 85ae047 + bbf199c commit 42eae25

File tree

4 files changed

+67
-45
lines changed

4 files changed

+67
-45
lines changed

.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
9+
[*.sh]
10+
indent_size = 2
11+
indent_style = space

.travis.yml

Lines changed: 53 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ stages:
2222

2323
jobs:
2424
include:
25+
- stage: Test
26+
env:
27+
- TEST: Editor Config check
28+
language: node_js
29+
node_js:
30+
- lts/*
31+
install:
32+
- npm i -g eclint
33+
script:
34+
- eclint check
35+
2536
- stage: Test
2637
env:
2738
- TEST: Doc Toc Check
@@ -53,105 +64,105 @@ jobs:
5364
# Docker Build #
5465
- stage: Build
5566
env:
56-
- NODE_VERSION: "10"
57-
- VARIANT: "default"
67+
- NODE_VERSION: "10"
68+
- VARIANT: "default"
5869

5970
- stage: Build
6071
env:
61-
- NODE_VERSION: "10"
62-
- VARIANT: "alpine"
72+
- NODE_VERSION: "10"
73+
- VARIANT: "alpine"
6374

6475
- stage: Build
6576
env:
66-
- NODE_VERSION: "10"
67-
- VARIANT: "slim"
77+
- NODE_VERSION: "10"
78+
- VARIANT: "slim"
6879

6980
- stage: Build
7081
env:
71-
- NODE_VERSION: "10"
72-
- VARIANT: "stretch"
82+
- NODE_VERSION: "10"
83+
- VARIANT: "stretch"
7384

7485
- stage: Build
7586
env:
76-
- NODE_VERSION: "6"
77-
- VARIANT: "default"
87+
- NODE_VERSION: "6"
88+
- VARIANT: "default"
7889

7990
- stage: Build
8091
env:
81-
- NODE_VERSION: "6"
82-
- VARIANT: "alpine"
92+
- NODE_VERSION: "6"
93+
- VARIANT: "alpine"
8394

8495
- stage: Build
8596
env:
86-
- NODE_VERSION: "6"
87-
- VARIANT: "onbuild"
97+
- NODE_VERSION: "6"
98+
- VARIANT: "onbuild"
8899

89100
- stage: Build
90101
env:
91-
- NODE_VERSION: "6"
92-
- VARIANT: "slim"
102+
- NODE_VERSION: "6"
103+
- VARIANT: "slim"
93104

94105
- stage: Build
95106
env:
96-
- NODE_VERSION: "6"
97-
- VARIANT: "stretch"
107+
- NODE_VERSION: "6"
108+
- VARIANT: "stretch"
98109

99110
- stage: Build
100111
env:
101-
- NODE_VERSION: "8"
102-
- VARIANT: "default"
112+
- NODE_VERSION: "8"
113+
- VARIANT: "default"
103114

104115
- stage: Build
105116
env:
106-
- NODE_VERSION: "8"
107-
- VARIANT: "alpine"
117+
- NODE_VERSION: "8"
118+
- VARIANT: "alpine"
108119

109120
- stage: Build
110121
env:
111-
- NODE_VERSION: "8"
112-
- VARIANT: "onbuild"
122+
- NODE_VERSION: "8"
123+
- VARIANT: "onbuild"
113124

114125
- stage: Build
115126
env:
116-
- NODE_VERSION: "8"
117-
- VARIANT: "slim"
127+
- NODE_VERSION: "8"
128+
- VARIANT: "slim"
118129

119130
- stage: Build
120131
env:
121-
- NODE_VERSION: "8"
122-
- VARIANT: "stretch"
132+
- NODE_VERSION: "8"
133+
- VARIANT: "stretch"
123134

124135
- stage: Build
125136
env:
126-
- NODE_VERSION: "9"
127-
- VARIANT: "default"
137+
- NODE_VERSION: "9"
138+
- VARIANT: "default"
128139

129140
- stage: Build
130141
env:
131-
- NODE_VERSION: "9"
132-
- VARIANT: "alpine"
142+
- NODE_VERSION: "9"
143+
- VARIANT: "alpine"
133144

134145
- stage: Build
135146
env:
136-
- NODE_VERSION: "9"
137-
- VARIANT: "onbuild"
147+
- NODE_VERSION: "9"
148+
- VARIANT: "onbuild"
138149

139150
- stage: Build
140151
env:
141-
- NODE_VERSION: "9"
142-
- VARIANT: "slim"
152+
- NODE_VERSION: "9"
153+
- VARIANT: "slim"
143154

144155
- stage: Build
145156
env:
146-
- NODE_VERSION: "9"
147-
- VARIANT: "stretch"
157+
- NODE_VERSION: "9"
158+
- VARIANT: "stretch"
148159

149160
- stage: Build
150161
env:
151-
- NODE_VERSION: "chakracore/10"
152-
- VARIANT: "default"
162+
- NODE_VERSION: "chakracore/10"
163+
- VARIANT: "default"
153164

154165
- stage: Build
155166
env:
156-
- NODE_VERSION: "chakracore/8"
157-
- VARIANT: "default"
167+
- NODE_VERSION: "chakracore/8"
168+
- VARIANT: "default"

docs/BestPractices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN deluser --remove-home node \
105105

106106
## Memory
107107

108-
By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume.
108+
By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume.
109109

110110
```
111111
-m "300M" --memory-swap "1G"

update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ function add_stage() {
7979

8080
echo ' - stage: Build
8181
env:
82-
- NODE_VERSION: "'"$version"'"
83-
- VARIANT: "'"$variant"'"
82+
- NODE_VERSION: "'"$version"'"
83+
- VARIANT: "'"$variant"'"
8484
' >>.travis.yml
8585
}
8686

0 commit comments

Comments
 (0)