Skip to content

Commit

Permalink
Merge pull request #856 from nschonni/editorconfig-cleanup
Browse files Browse the repository at this point in the history
Apply Editorconfig checking to the build
  • Loading branch information
mcking65 committed Apr 22, 2019
2 parents cac5fe0 + 8afef95 commit 56f6f54
Show file tree
Hide file tree
Showing 144 changed files with 3,408 additions and 2,090 deletions.
30 changes: 25 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,37 @@
# Set to false if aria repo gets one.
root = true


# Unix-style newlines with a newline ending every file
[*]
[*.{html,css,js}]
charset = "utf-8"
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{html,css,js}]
indent_style = space
indent_size = 2
block_comment_start = /*
block_comment = *
block_comment_end = */

[*.md]
charset = "utf-8"
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = false

# Ignore third party content
[{/common/**,/examples/landmarks/js/visua11y.js,/examples/landmarks/css/bootstrap.css,/examples/landmarks/css/bootstrap-accessibility.css,/examples/menubar/menubar-1/images/separator.paint}]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

# Ignore minfied files
[*.{min.js,pack.js}]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.paint binary
11 changes: 2 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,9 @@ jobs:
- stage: Test
name: HTML Linting
script: npm run vnu-jar

- stage: Test
name: AVA Regression Tests
script: ava -c 1 test/tests
env: TEST_WAIT_TIME=1000
- stage: Test
name: Regression Tests Coverage Report
script: node test/util/report.js
env: ALLOW_FAILURE=true

name: EditorConfig Linting
script: npm run lint:ec
- stage: Deploy
if: branch = master AND type != pull_request
script: skip
Expand Down
1 change: 0 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
All documents in this Repository are licensed by contributors
under the
[W3C Software and Document License](https://www.w3.org/Consortium/Legal/copyright-software).

Loading

0 comments on commit 56f6f54

Please sign in to comment.