Skip to content

Commit

Permalink
feat(yamllint): include for this repo and apply rules throughout
Browse files Browse the repository at this point in the history
* Semi-automated using `ssf-formula` (v0.5.0)
* Fix errors shown below:

```bash
locale-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:")
./locale/defaults.yaml
  1:1       warning  missing document start "---"  (document-start)

pillar.example
  1:1       warning  missing document start "---"  (document-start)
  5:11      error    trailing spaces  (trailing-spaces)
  6:25      warning  too few spaces before comment  (comments)
  6:66      error    trailing spaces  (trailing-spaces)
  7:25      warning  comment not indented like content  (comments-indentation)
  7:69      error    trailing spaces  (trailing-spaces)

test/salt/pillar/default.sls
  1:1       warning  missing document start "---"  (document-start)

test/salt/pillar/fedora.sls
  1:1       warning  missing document start "---"  (document-start)
```
  • Loading branch information
myii committed Aug 8, 2019
1 parent 3b9a2f1 commit 5cdb75e
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 10 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
stages:
- test
- commitlint
- lint
- name: release
if: branch = master AND type != pull_request

Expand Down Expand Up @@ -45,16 +45,21 @@ script:

jobs:
include:
# Define the commitlint stage
- stage: commitlint
# Define the `lint` stage (runs `yamllint` and `commitlint`)
- stage: lint
language: node_js
node_js: lts/*
before_install: skip
script:
# Install and run `yamllint`
- pip install --user yamllint
# yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example test/salt/pillar/default.sls test/salt/pillar/fedora.sls
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D
- commitlint-travis
# Define the release stage that runs semantic-release
# Define the release stage that runs `semantic-release`
- stage: release
language: node_js
node_js: lts/*
Expand Down
16 changes: 16 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# Extend the `default` configuration provided by `yamllint`
extends: default

# Files to ignore completely
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
ignore: |
node_modules/
rules:
line-length:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
max: 88
3 changes: 3 additions & 0 deletions locale/defaults.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
locale:
config: '/etc/locale.conf'
pkgs: []
Expand Down
14 changes: 8 additions & 6 deletions pillar.example
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
locale:
present:
- "en_US.UTF-8 UTF-8"
- "de_DE.UTF-8 UTF-8"
default:
name: 'en_US.UTF-8' # Note: On debian systems don't write the
# second 'UTF-8' here or you will experience
# salt problems like:
# LookupError: unknown encoding: utf_8_utf_8
# Restart the minion after you corrected this!
default:
# Note: On debian systems don't write the second 'UTF-8' here or you will
# experience salt problems like: LookupError: unknown encoding: utf_8_utf_8
# Restart the minion after you corrected this!
name: 'en_US.UTF-8'
requires: 'en_US.UTF-8 UTF-8'
# You can manipulate the contents of /etc/locale.conf, e.g.
conf:
Expand Down
3 changes: 3 additions & 0 deletions test/integration/default/inspec.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
name: default
title: locale formula
maintainer: SaltStack Formulas
Expand Down
3 changes: 3 additions & 0 deletions test/salt/pillar/default.sls
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
locale:
present:
- "en_US.UTF-8 UTF-8"
Expand Down
3 changes: 3 additions & 0 deletions test/salt/pillar/fedora.sls
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
locale:
pkgs:
- glibc-langpack-de

0 comments on commit 5cdb75e

Please sign in to comment.