Skip to content

Commit

Permalink
Merge pull request #80 from myii/feat/remove-PyYAML-for-salt-lint
Browse files Browse the repository at this point in the history
feat(ufw): remove `PyYAML` requirement for `salt-lint` in `.travis.yml`
  • Loading branch information
myii authored Oct 19, 2019
2 parents 8dc97bc + 6d3b391 commit 86e0503
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'feat(semantic-release): implement for this formula'
body: '* Automated using https://github.com/myii/ssf-formula/pull/78'
title: 'ci(travis): remove `PyYAML` workaround since fixed in `salt-lint` v0.0.9'
body: '* Automated using https://github.com/myii/ssf-formula/pull/80'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down
5 changes: 2 additions & 3 deletions ssf/files/default/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,14 @@ jobs:
before_install: skip
script:
{%- set pip_cmd = 'pip' %}
{%- set pkgs_for_salt_lint = 'salt-lint' %}
{%- if semrel_formula == 'ufw' %}
{%- set pip_cmd = 'pip3' %}
{%- set pkgs_for_salt_lint = pkgs_for_salt_lint ~ ' PyYAML==4.2b4' %}
# Need to use `pip3` due to using `{{ travis.dist }}` on Travis
# [Py2/InsecurePlatformWarning] Tornado requires an up-to-date SSL module.
- sudo apt-get install python3-pip python3-setuptools python3-wheel -y
{%- endif %}
# Install and run `salt-lint`
- {{ pip_cmd }} install --user {{ pkgs_for_salt_lint }}
- {{ pip_cmd }} install --user salt-lint
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
| xargs -I {} salt-lint {}
# Install and run `yamllint`
Expand Down

0 comments on commit 86e0503

Please sign in to comment.