From 465f4a97a5ffd4f8fa4de2722ffdbd33be6d9d54 Mon Sep 17 00:00:00 2001 From: Xorima Bot Date: Wed, 15 Apr 2020 07:47:25 +0000 Subject: [PATCH] Standardise files with files in chef-cookbooks/repo-management Signed-off-by: Xorima Bot --- .editorconfig | 11 ++++ .gitattributes | 1 + .github/workflows/branchcleanup.yml | 17 ++++++ .gitignore | 1 - TESTING.md | 3 +- chefignore | 81 +++++++++++++++++------------ 6 files changed, 79 insertions(+), 35 deletions(-) create mode 100755 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/workflows/branchcleanup.yml diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..1656a6d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +#https://EditorConfig.org +# top-most EditorConfig file +root=true + +[*] +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 +charset = utf-8 +trim_trailing_whitespace = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6313b56 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/.github/workflows/branchcleanup.yml b/.github/workflows/branchcleanup.yml new file mode 100644 index 0000000..bbc44e9 --- /dev/null +++ b/.github/workflows/branchcleanup.yml @@ -0,0 +1,17 @@ +--- +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. +on: + pull_request: + types: [closed] + +env: + NO_BRANCH_DELETED_EXIT_CODE: 0 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: jessfraz/branch-cleanup-action@master diff --git a/.gitignore b/.gitignore index 8f93e57..e085291 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,3 @@ Policyfile.lock.json # vagrant stuff .vagrant/ .vagrant.d/ -.kitchen/ diff --git a/TESTING.md b/TESTING.md index 359579c..ca524ab 100644 --- a/TESTING.md +++ b/TESTING.md @@ -1 +1,2 @@ -Please refer to +Please refer to +https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD diff --git a/chefignore b/chefignore index 6ee857c..7cc7460 100644 --- a/chefignore +++ b/chefignore @@ -1,13 +1,13 @@ # Put files/directories that should be ignored in this file when uploading -# to a chef-server or supermarket. +# to a Chef Infra Server or Supermarket. # Lines that start with '# ' are comments. # OS generated files # ###################### .DS_Store +ehthumbs.db Icon? nohup.out -ehthumbs.db Thumbs.db # SASS # @@ -16,61 +16,64 @@ Thumbs.db # EDITORS # ########### -\#* .#* -*~ -*.sw[a-z] +.project +.settings +*_flymake +*_flymake.* *.bak +*.sw[a-z] +*.tmproj +*~ +\#* +mkmf.log REVISION TAGS* tmtags -*_flymake.* -*_flymake -*.tmproj -.project -.settings -mkmf.log ## COMPILED ## ############## -a.out +*.class +*.com +*.dll +*.exe *.o *.pyc *.so -*.com -*.class -*.dll -*.exe */rdoc/ +a.out # Testing # ########### -.rspec -spec/* -spec/fixtures/* -test/* -features/* -examples/* -Procfile -.kitchen* -kitchen* -.rubocop.yml -spec/* -.travis.yml +.circleci/* +.codeclimate.yml .foodcritic -appveyor.yml +.kitchen* +.rspec +.rubocop.yml +.travis.yml +.watchr +azure-pipelines.yml +examples/* +features/* +Guardfile +kitchen.yml* +Procfile Rakefile +spec/* +test/* # SCM # ####### .git -*/.git +.gitattributes +.gitconfig +.github/* .gitignore .gitmodules -.gitconfig -.gitattributes .svn */.bzr/* +*/.git */.hg/* */.svn/* @@ -81,6 +84,12 @@ Berksfile.lock cookbooks/* tmp +# Bundler # +########### +vendor/* +Gemfile +Gemfile.lock + # Policyfile # ############## Policyfile.rb @@ -88,6 +97,12 @@ Policyfile.lock.json # Cookbooks # ############# -CONTRIBUTING* CHANGELOG* +CONTRIBUTING* TESTING* +CODE_OF_CONDUCT* + +# Vagrant # +########### +.vagrant +Vagrantfile