Skip to content

Commit f0d12ca

Browse files
committed
ci(travis): run shellcheck during lint job [skip ci]
* Automated using myii/ssf-formula#106
1 parent bd5959c commit f0d12ca

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,24 @@ jobs:
3232
- language: 'node_js'
3333
node_js: 'lts/*'
3434
env: 'Lint'
35-
name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
35+
name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
3636
before_install: 'skip'
3737
script:
3838
# Install and run `salt-lint`
3939
- pip install --user salt-lint
40-
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
41-
| xargs salt-lint
40+
- git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
41+
| xargs salt-lint
4242
# Install and run `yamllint`
4343
# Need at least `v1.17.0` for the `yaml-files` setting
4444
- pip install --user yamllint>=1.17.0
4545
- yamllint -s .
4646
# Install and run `rubocop`
4747
- gem install rubocop
4848
- rubocop -d
49+
# Run `shellcheck` (already pre-installed in Travis)
50+
- shellcheck --version
51+
- git ls-files -- *.sh *.bash *.ksh
52+
| xargs shellcheck
4953
# Install and run `commitlint`
5054
- npm i -D @commitlint/config-conventional
5155
@commitlint/travis-cli

pre-commit_semantic-release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
1414
sudo -H pip install m2r
1515

1616
# Copy and then convert the `.md` docs
17-
cp *.md docs/
18-
cd docs/
19-
m2r --overwrite *.md
17+
cp ./*.md docs/
18+
cd docs/ || exit
19+
m2r --overwrite ./*.md
2020

2121
# Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
2222
sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst

0 commit comments

Comments
 (0)