refactor(travis): use pathspecs for git ls-files instead of grep

* Apply suggestion received here: - saltstack-formulas/template-formula#181 (comment)
myii · Nov 27, 2019 · 615e3b2 · 615e3b2
1 parent f52eb37
commit 615e3b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,8 +29,8 @@ jobs:
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
-                       | xargs salt-lint
+        - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
+                        | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
@@ -40,8 +40,8 @@ jobs:
         - rubocop -d
         # Run `shellcheck` (already pre-installed in Travis)
         - shellcheck --version
-        - git ls-files | grep '\.sh$\|\.bash$\|\.ksh$'
-                       | xargs shellcheck
+        - git ls-files -- *.sh *.bash *.ksh
+                        | xargs shellcheck
         # Install and run `commitlint`
         - npm i -D @commitlint/config-conventional
                    @commitlint/travis-cli

diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml
@@ -128,8 +128,8 @@ jobs:
         {%- endif %}
         # Install and run `salt-lint`
         - {{ pip_cmd }} install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
-                       | xargs salt-lint
+        - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
+                        | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
         - {{ pip_cmd }} install --user yamllint>=1.17.0
@@ -139,8 +139,8 @@ jobs:
         {%- endif %}
         # Run `shellcheck` (already pre-installed in Travis)
         - shellcheck --version
-        - git ls-files | grep '\.sh$\|\.bash$\|\.ksh$'
-                       | xargs shellcheck
+        - git ls-files -- *.sh *.bash *.ksh
+                        | xargs shellcheck
         # Install and run `commitlint`
         - npm i -D @commitlint/config-conventional
                    @commitlint/travis-cli