Skip to content

Commit 8128462

Browse files
authored
Merge pull request #250 from chef-cookbooks/automated/standardfiles
Automated PR: Standardising Files
2 parents a6d640a + bacbab2 commit 8128462

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.editorconfig

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
#https://EditorConfig.org
1+
# https://EditorConfig.org
2+
23
# top-most EditorConfig file
34
root=true
45

6+
# Unix-style newlines with a newline ending every file
57
[*]
68
end_of_line = lf
79
insert_final_newline = true
10+
11+
# 2 space indentation
812
indent_style = space
913
indent_size = 2
14+
15+
# Avoid issues parsing cookbook files later
1016
charset = utf-8
17+
18+
# Avoid cookstyle warnings
1119
trim_trailing_whitespace = true

.github/workflows/branchcleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Branch Cleanup
33
# This workflow is triggered on all closed pull requests.
4-
# However the script does not do anything it a merge was not performed.
4+
# However the script does not do anything if a merge was not performed.
55
on:
66
pull_request:
77
types: [closed]

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
*.rbc
22
.config
3-
coverage
43
InstalledFiles
54
lib/bundler/man
65
pkg
7-
rdoc
8-
spec/reports
96
test/tmp
107
test/version_tmp
118
tmp
@@ -14,27 +11,32 @@ _Store
1411
*#
1512
.#*
1613
\#*#
17-
.*.sw[a-z]
1814
*.un~
1915
*.tmp
2016
*.bk
2117
*.bkup
2218

19+
# editor temp files
20+
.idea
21+
.*.sw[a-z]
22+
2323
# ruby/bundler files
2424
.ruby-version
2525
.ruby-gemset
2626
.rvmrc
2727
Gemfile.lock
2828
.bundle
2929
*.gem
30+
coverage
31+
spec/reports
3032

31-
# YARD artifacts
33+
# YARD / rdoc artifacts
3234
.yardoc
3335
_yardoc
3436
doc/
35-
.idea
37+
rdoc
3638

37-
# chef stuff
39+
# chef infra stuff
3840
Berksfile.lock
3941
.kitchen
4042
kitchen.local.yml

0 commit comments

Comments
 (0)