diff options
author | Tim Smith <tsmith@chef.io> | 2021-04-14 18:07:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-14 18:07:36 -0700 |
commit | 1adb90d9c4c1783f13077dfd37f17d2a7fa045e0 (patch) | |
tree | f82c9ad4becb72d33c444e405bcad7f39c1c50cc | |
parent | f29c0a01e0ab8d770dda32e2ba1286b01d26aade (diff) | |
parent | 81aee8b5e4f479e242615bd20d271b20db69c9d8 (diff) | |
download | chef-1adb90d9c4c1783f13077dfd37f17d2a7fa045e0.tar.gz |
Merge pull request #11374 from chef/rubocop_inline
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .github/workflows/lint.yml | 15 | ||||
-rw-r--r-- | .github/workflows/spellcheck.yml | 23 |
2 files changed, 15 insertions, 23 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7462be46f3..159706e9e3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,4 +18,19 @@ jobs: with: ruby-version: 2.7 bundler-cache: true + - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR - run: bundle exec rake style + + spellcheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: carlosperate/download-file-action@v1.0.3 + id: download-custom-dictionary + with: + file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/master/chef.txt' + file-name: 'chef_dictionary.txt' + - uses: zwaldowski/cspell-action@v1 + with: + config: cspell.json + paths: "**/*" diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml deleted file mode 100644 index 554d677453..0000000000 --- a/.github/workflows/spellcheck.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: spellcheck - -"on": - pull_request: - push: - branches: - - master - -jobs: - spellcheck: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: carlosperate/download-file-action@v1.0.3 - id: download-custom-dictionary - with: - file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/master/chef.txt' - file-name: 'chef_dictionary.txt' - - uses: zwaldowski/cspell-action@v1 - with: - config: cspell.json - paths: "**/*" |