Skip to content

Commit

Permalink
Merge pull request nodejs#730 from nodejs/editorocnfig
Browse files Browse the repository at this point in the history
Introduce EditorConfig
  • Loading branch information
LaurentGoderre authored May 15, 2018
2 parents 85ae047 + bbf199c commit 42eae25
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 45 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.sh]
indent_size = 2
indent_style = space
95 changes: 53 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ stages:

jobs:
include:
- stage: Test
env:
- TEST: Editor Config check
language: node_js
node_js:
- lts/*
install:
- npm i -g eclint
script:
- eclint check

- stage: Test
env:
- TEST: Doc Toc Check
Expand Down Expand Up @@ -53,105 +64,105 @@ jobs:
# Docker Build #
- stage: Build
env:
- NODE_VERSION: "10"
- VARIANT: "default"
- NODE_VERSION: "10"
- VARIANT: "default"

- stage: Build
env:
- NODE_VERSION: "10"
- VARIANT: "alpine"
- NODE_VERSION: "10"
- VARIANT: "alpine"

- stage: Build
env:
- NODE_VERSION: "10"
- VARIANT: "slim"
- NODE_VERSION: "10"
- VARIANT: "slim"

- stage: Build
env:
- NODE_VERSION: "10"
- VARIANT: "stretch"
- NODE_VERSION: "10"
- VARIANT: "stretch"

- stage: Build
env:
- NODE_VERSION: "6"
- VARIANT: "default"
- NODE_VERSION: "6"
- VARIANT: "default"

- stage: Build
env:
- NODE_VERSION: "6"
- VARIANT: "alpine"
- NODE_VERSION: "6"
- VARIANT: "alpine"

- stage: Build
env:
- NODE_VERSION: "6"
- VARIANT: "onbuild"
- NODE_VERSION: "6"
- VARIANT: "onbuild"

- stage: Build
env:
- NODE_VERSION: "6"
- VARIANT: "slim"
- NODE_VERSION: "6"
- VARIANT: "slim"

- stage: Build
env:
- NODE_VERSION: "6"
- VARIANT: "stretch"
- NODE_VERSION: "6"
- VARIANT: "stretch"

- stage: Build
env:
- NODE_VERSION: "8"
- VARIANT: "default"
- NODE_VERSION: "8"
- VARIANT: "default"

- stage: Build
env:
- NODE_VERSION: "8"
- VARIANT: "alpine"
- NODE_VERSION: "8"
- VARIANT: "alpine"

- stage: Build
env:
- NODE_VERSION: "8"
- VARIANT: "onbuild"
- NODE_VERSION: "8"
- VARIANT: "onbuild"

- stage: Build
env:
- NODE_VERSION: "8"
- VARIANT: "slim"
- NODE_VERSION: "8"
- VARIANT: "slim"

- stage: Build
env:
- NODE_VERSION: "8"
- VARIANT: "stretch"
- NODE_VERSION: "8"
- VARIANT: "stretch"

- stage: Build
env:
- NODE_VERSION: "9"
- VARIANT: "default"
- NODE_VERSION: "9"
- VARIANT: "default"

- stage: Build
env:
- NODE_VERSION: "9"
- VARIANT: "alpine"
- NODE_VERSION: "9"
- VARIANT: "alpine"

- stage: Build
env:
- NODE_VERSION: "9"
- VARIANT: "onbuild"
- NODE_VERSION: "9"
- VARIANT: "onbuild"

- stage: Build
env:
- NODE_VERSION: "9"
- VARIANT: "slim"
- NODE_VERSION: "9"
- VARIANT: "slim"

- stage: Build
env:
- NODE_VERSION: "9"
- VARIANT: "stretch"
- NODE_VERSION: "9"
- VARIANT: "stretch"

- stage: Build
env:
- NODE_VERSION: "chakracore/10"
- VARIANT: "default"
- NODE_VERSION: "chakracore/10"
- VARIANT: "default"

- stage: Build
env:
- NODE_VERSION: "chakracore/8"
- VARIANT: "default"
- NODE_VERSION: "chakracore/8"
- VARIANT: "default"
2 changes: 1 addition & 1 deletion docs/BestPractices.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RUN deluser --remove-home node \

## Memory

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.
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.

```
-m "300M" --memory-swap "1G"
Expand Down
4 changes: 2 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ function add_stage() {

echo ' - stage: Build
env:
- NODE_VERSION: "'"$version"'"
- VARIANT: "'"$variant"'"
- NODE_VERSION: "'"$version"'"
- VARIANT: "'"$variant"'"
' >>.travis.yml
}

Expand Down

0 comments on commit 42eae25

Please sign in to comment.