Skip to content

Commit 1b2eb28

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

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
@@ -54,20 +54,24 @@ jobs:
5454
- language: 'node_js'
5555
node_js: 'lts/*'
5656
env: 'Lint'
57-
name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
57+
name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
5858
before_install: 'skip'
5959
script:
6060
# Install and run `salt-lint`
6161
- pip install --user salt-lint
62-
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
63-
| xargs salt-lint
62+
- git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
63+
| xargs salt-lint
6464
# Install and run `yamllint`
6565
# Need at least `v1.17.0` for the `yaml-files` setting
6666
- pip install --user yamllint>=1.17.0
6767
- yamllint -s .
6868
# Install and run `rubocop`
6969
- gem install rubocop
7070
- rubocop -d
71+
# Run `shellcheck` (already pre-installed in Travis)
72+
- shellcheck --version
73+
- git ls-files -- *.sh *.bash *.ksh
74+
| xargs shellcheck
7175
# Install and run `commitlint`
7276
- npm i -D @commitlint/config-conventional
7377
@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)