Skip to content

Commit

Permalink
Merge b0c42ff into 6d926f3
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Mar 7, 2020
2 parents 6d926f3 + b0c42ff commit 348af68
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
15 changes: 8 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ root = true
indent_style = space
indent_size = 4
insert_final_newline = true
# comment style for lint
# C-style doc comments
block_comment_start = /*
block_comment = *
block_comment_end = */
line_comment = //

[{Makefile,GNUmakefile}]
indent_style = tab
Expand Down Expand Up @@ -52,10 +58,5 @@ indent_size = 2
[*.code-workspace]
indent_style = tab

# comment style for lint
[*]
# C-style doc comments
block_comment_start = /*
block_comment = *
block_comment_end = */
line_comment = //
[Dockerfile]
indent_size = 2
1 change: 0 additions & 1 deletion .github/actions/arm-none-eabi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ LABEL "repository"="https://github.com/srz-zumix/iutest"
LABEL "homepage"="https://github.com/srz-zumix/iutest"
LABEL "maintainer"="https://github.com/srz-zumix"


# https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads
RUN dpkg --add-architecture i386 && \
apt-get update && apt-get -y --no-install-recommends install \
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"dependencies": {},
"devDependencies": {
"eclint": "^2.8.1",
"editorconfig-checker": "^1.3.3",
"editorconfig-checker": "^3.0.0",
"npm-run-all": "^4.1.5"
},
"scripts": {
"lint:editorconfig": "npm-run-all eclint eccheck",
"eccheck": "editorconfig-checker --exclude-regexp \"\\.sln|\\..*proj\" .",
"eccheck": "editorconfig-checker --exclude \"\\.sln|\\..*proj\" .",
"eccheck:cpp": "editorconfig-checker src include",
"eclint": "npm-run-all eclint:*",
"eclint:src": "eclint check ./src",
Expand Down

0 comments on commit 348af68

Please sign in to comment.