From e66dd78ae95dab4f008adfe0f81df388f635f21c Mon Sep 17 00:00:00 2001 From: Xorima Bot Date: Thu, 16 Apr 2020 11:08:49 +0000 Subject: [PATCH] Standardise files with files in chef-cookbooks/repo-management Signed-off-by: Xorima Bot --- .editorconfig | 10 +++++++++- .github/workflows/branchcleanup.yml | 2 +- .gitignore | 16 +++++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1656a6d..cc21b04 100755 --- a/.editorconfig +++ b/.editorconfig @@ -1,11 +1,19 @@ -#https://EditorConfig.org +# https://EditorConfig.org + # top-most EditorConfig file root=true +# Unix-style newlines with a newline ending every file [*] end_of_line = lf insert_final_newline = true + +# 2 space indentation indent_style = space indent_size = 2 + +# Avoid issues parsing cookbook files later charset = utf-8 + +# Avoid cookstyle warnings trim_trailing_whitespace = true diff --git a/.github/workflows/branchcleanup.yml b/.github/workflows/branchcleanup.yml index bbc44e9..2aa1e96 100644 --- a/.github/workflows/branchcleanup.yml +++ b/.github/workflows/branchcleanup.yml @@ -1,7 +1,7 @@ --- name: Branch Cleanup # This workflow is triggered on all closed pull requests. -# However the script does not do anything it a merge was not performed. +# However the script does not do anything if a merge was not performed. on: pull_request: types: [closed] diff --git a/.gitignore b/.gitignore index e085291..e6099d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ *.rbc .config -coverage InstalledFiles lib/bundler/man pkg -rdoc -spec/reports test/tmp test/version_tmp tmp @@ -14,12 +11,15 @@ _Store *# .#* \#*# -.*.sw[a-z] *.un~ *.tmp *.bk *.bkup +# editor temp files +.idea +.*.sw[a-z] + # ruby/bundler files .ruby-version .ruby-gemset @@ -27,14 +27,16 @@ _Store Gemfile.lock .bundle *.gem +coverage +spec/reports -# YARD artifacts +# YARD / rdoc artifacts .yardoc _yardoc doc/ -.idea +rdoc -# chef stuff +# chef infra stuff Berksfile.lock .kitchen kitchen.local.yml