Skip to content

Commit 373ff11

Browse files
committed
chore: use semantic-release cross-formula standard structure
* Checked using myii/ssf-formula#44
1 parent 2112711 commit 373ff11

File tree

3 files changed

+18
-44
lines changed

3 files changed

+18
-44
lines changed

.travis.yml

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,10 @@
33
---
44
dist: bionic
55
stages:
6-
- test
76
- lint
87
- name: release
98
if: branch = master AND type != pull_request
109

11-
sudo: required
12-
cache: bundler
13-
language: ruby
14-
15-
services:
16-
- docker
17-
18-
# Make sure the instances listed below match up with
19-
# the `platforms` defined in `kitchen.yml`
20-
env:
21-
matrix:
22-
- INSTANCE: default-debian-10-develop-py3
23-
# - INSTANCE: default-ubuntu-1804-develop-py3
24-
# - INSTANCE: default-centos-7-develop-py3
25-
# - INSTANCE: default-fedora-30-develop-py3
26-
# - INSTANCE: default-opensuse-leap-15-develop-py3
27-
# - INSTANCE: default-amazonlinux-2-develop-py2
28-
# - INSTANCE: default-debian-9-2019-2-py3
29-
- INSTANCE: default-ubuntu-1804-2019-2-py3
30-
# - INSTANCE: default-centos-7-2019-2-py3
31-
# - INSTANCE: default-fedora-30-2019-2-py3
32-
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
33-
- INSTANCE: default-amazonlinux-2-2019-2-py2
34-
# - INSTANCE: default-debian-9-2018-3-py2
35-
# - INSTANCE: default-ubuntu-1604-2018-3-py2
36-
# - INSTANCE: default-centos-7-2018-3-py2
37-
- INSTANCE: default-fedora-29-2018-3-py2
38-
- INSTANCE: default-opensuse-leap-15-2018-3-py2
39-
# - INSTANCE: default-amazonlinux-2-2018-3-py2
40-
# - INSTANCE: default-debian-8-2017-7-py2
41-
# - INSTANCE: default-ubuntu-1604-2017-7-py2
42-
- INSTANCE: default-centos-6-2017-7-py2
43-
# - INSTANCE: default-fedora-29-2017-7-py2
44-
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
45-
# - INSTANCE: default-amazonlinux-2-2017-7-py2
46-
47-
script:
48-
- bin/kitchen verify ${INSTANCE}
49-
5010
jobs:
5111
include:
5212
# Define the `lint` stage (runs `yamllint` and `commitlint`)
@@ -56,9 +16,9 @@ jobs:
5616
before_install: skip
5717
script:
5818
# Install and run `yamllint`
59-
- pip install --user yamllint
60-
# yamllint disable-line rule:line-length
61-
- yamllint -s . .yamllint pillar.example pillar.debian.example
19+
# Need at least `v1.17.0` for the `yaml-files` setting
20+
- pip install --user yamllint>=1.17.0
21+
- yamllint -s .
6222
# Install and run `commitlint`
6323
- npm install @commitlint/config-conventional -D
6424
- npm install @commitlint/travis-cli -D

.yamllint

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,24 @@ extends: default
66

77
# Files to ignore completely
88
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
9+
# 2. Any SLS files under directory `test/`, which are actually state files
910
ignore: |
1011
node_modules/
12+
test/**/states/**/*.sls
13+
14+
yaml-files:
15+
# Default settings
16+
- '*.yaml'
17+
- '*.yml'
18+
- .yamllint
19+
# SaltStack Formulas additional settings
20+
- '*.example'
21+
- test/**/*.sls
1122

1223
rules:
24+
empty-values:
25+
forbid-in-block-mappings: true
26+
forbid-in-flow-mappings: true
1327
line-length:
1428
# Increase from default of `80`
1529
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)

kitchen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ platforms:
151151

152152
provisioner:
153153
name: salt_solo
154-
log_level: info
154+
log_level: debug
155155
salt_install: none
156156
require_chef: false
157157
formula: syslog_ng

0 commit comments

Comments
 (0)