Skip to content

Commit ea6be11

Browse files
myiimyii
committed
feat(semantic-release): implement for this formula
* Semi-automated using myii/ssf-formula#78 * Fix (or ignore) `yamllint` errors: ```bash docker-formula$ yamllint -s . ./pillar.example 5:1 warning missing document start "---" (document-start) 10:8 warning missing starting space in comment (comments) 12:11 error empty value in block mapping (empty-values) 13:89 error line too long (92 > 88 characters) (line-length) 14:26 warning truthy value should be one of [false, true] (truthy) 28:1 error trailing spaces (trailing-spaces) 32:11 error empty value in block mapping (empty-values) 36:89 error line too long (92 > 88 characters) (line-length) 37:26 warning truthy value should be one of [false, true] (truthy) 58:4 warning missing starting space in comment (comments) 59:4 warning missing starting space in comment (comments) 61:4 warning missing starting space in comment (comments) 62:4 warning missing starting space in comment (comments) 63:21 warning truthy value should be one of [false, true] (truthy) 64:1 error trailing spaces (trailing-spaces) 65:89 error line too long (93 > 88 characters) (line-length) 66:4 warning missing starting space in comment (comments) 76:3 warning comment not indented like content (comments-indentation) 77:6 warning missing starting space in comment (comments) 78:6 warning missing starting space in comment (comments) 79:23 warning truthy value should be one of [false, true] (truthy) 87:20 warning truthy value should be one of [false, true] (truthy) 88:20 warning truthy value should be one of [false, true] (truthy) 92:12 warning truthy value should be one of [false, true] (truthy) 111:8 warning missing starting space in comment (comments) 119:4 error syntax error: expected <block end>, but found '<block mapping start>' 120:8 warning missing starting space in comment (comments) 121:7 error wrong indentation: expected 5 but found 6 (indentation) 132:8 warning missing starting space in comment (comments) 145:2 warning missing starting space in comment (comments) 147:5 warning comment not indented like content (comments-indentation) 148:6 warning missing starting space in comment (comments) 149:6 warning missing starting space in comment (comments) 150:6 warning missing starting space in comment (comments) 154:6 warning missing starting space in comment (comments) 155:6 warning missing starting space in comment (comments) 157:2 warning missing starting space in comment (comments) 159:6 warning comment not indented like content (comments-indentation) 169:6 warning comment not indented like content (comments-indentation) 174:1 error too many blank lines (1 > 0) (empty-lines) ./docker/defaults.yaml 3:1 warning missing document start "---" (document-start) 5:22 warning truthy value should be one of [false, true] (truthy) 7:17 warning truthy value should be one of [false, true] (truthy) 14:22 warning truthy value should be one of [false, true] (truthy) 15:17 warning truthy value should be one of [false, true] (truthy) 16:10 warning truthy value should be one of [false, true] (truthy) 27:20 warning truthy value should be one of [false, true] (truthy) 28:11 warning truthy value should be one of [false, true] (truthy) 29:23 warning truthy value should be one of [false, true] (truthy) 29:35 warning missing starting space in comment (comments) 32:23 warning truthy value should be one of [false, true] (truthy) 33:14 warning truthy value should be one of [false, true] (truthy) 39:20 warning truthy value should be one of [false, true] (truthy) 40:20 warning truthy value should be one of [false, true] (truthy) 46:1 error too many blank lines (1 > 0) (empty-lines) ./docker/osfamilymap.yaml 13:2 error syntax error: found character '%' that cannot start any token 50:89 error line too long (164 > 88 characters) (line-length) ./docker/codenamemap.yaml 3:1 warning missing document start "---" (document-start) 36:1 error too many blank lines (1 > 0) (empty-lines) ./docker/osmap.yaml 1:1 error too many blank lines (1 > 0) (empty-lines) 2:1 warning missing document start "---" (document-start) (saltstack) imran@E6530:~/Salt/formulas/docker-formula$ yamllint -s . ./docker/osfamilymap.yaml 13:2 error syntax error: found character '%' that cannot start any token 51:89 error line too long (164 > 88 characters) (line-length) ```
1 parent 71ee3c4 commit ea6be11

22 files changed

+832
-220
lines changed

‎.gitignore‎

Lines changed: 108 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
1-
.kitchen/
2-
.ruby-version
3-
junit*.xml
4-
51
# Byte-compiled / optimized / DLL files
62
__pycache__/
73
*.py[cod]
84
*$py.class
95

6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
28+
# PyInstaller
29+
# Usually these files are written by a python script from a packager
30+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
*.manifest
32+
*.spec
33+
34+
# Installer logs
35+
pip-log.txt
36+
pip-delete-this-directory.txt
37+
1038
# Unit test / coverage reports
1139
htmlcov/
1240
.tox/
@@ -15,5 +43,80 @@ htmlcov/
1543
.cache
1644
nosetests.xml
1745
coverage.xml
18-
*,cover
46+
*.cover
1947
.hypothesis/
48+
.kitchen
49+
.kitchen.local.yml
50+
kitchen.local.yml
51+
junit-*.xml
52+
53+
# Translations
54+
*.mo
55+
*.pot
56+
57+
# Django stuff:
58+
*.log
59+
local_settings.py
60+
61+
# Flask stuff:
62+
instance/
63+
.webassets-cache
64+
65+
# Scrapy stuff:
66+
.scrapy
67+
68+
# Sphinx documentation
69+
docs/_build/
70+
71+
# PyBuilder
72+
target/
73+
74+
# Jupyter Notebook
75+
.ipynb_checkpoints
76+
77+
# pyenv
78+
.python-version
79+
80+
# celery beat schedule file
81+
celerybeat-schedule
82+
83+
# SageMath parsed files
84+
*.sage.py
85+
86+
# dotenv
87+
.env
88+
89+
# virtualenv
90+
.venv
91+
venv/
92+
ENV/
93+
94+
# Spyder project settings
95+
.spyderproject
96+
.spyproject
97+
98+
# Rope project settings
99+
.ropeproject
100+
101+
# mkdocs documentation
102+
/site
103+
104+
# mypy
105+
.mypy_cache/
106+
107+
# Bundler
108+
Gemfile.lock
109+
110+
# copied `.md` files used for conversion to `.rst` using `m2r`
111+
docs/*.md
112+
113+
# Vim
114+
*.sw?
115+
116+
## Collected when centralising formulas (check and sort)
117+
# `collectd-formula`
118+
.pytest_cache/
119+
/.idea/
120+
Dockerfile.*_*
121+
ignore/
122+
tmp/

‎.kitchen.yml‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎.rubocop.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
# General overrides used across formulas in the org
5+
Metrics/LineLength:
6+
# Increase from default of `80`
7+
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
8+
Max: 88
9+
10+
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

‎.salt-lint‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
exclude_paths:
5+
# Violation: [204] Lines should be no longer that 160 chars
6+
- docker/repo.sls
7+
skip_list:
8+
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
9+
- 205 # Use ".sls" as a Salt State file extension
10+
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
11+
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
12+
- 207 # File modes should always be encapsulated in quotation marks
13+
- 208 # File modes should always contain a leading zero
14+
tags: []
15+
verbosity: 1

‎.travis.yml‎

Lines changed: 96 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,104 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
## Machine config
5+
dist: bionic
16
sudo: required
7+
services:
8+
- docker
29

10+
## Language and cache config
11+
language: ruby
12+
cache: bundler
313

4-
language: python
14+
## Script to run for the test stage
15+
script:
16+
- bin/kitchen verify "${INSTANCE}"
517

6-
services:
7-
- docker
18+
## Stages and jobs matrix
19+
stages:
20+
- test
21+
- name: release
22+
if: branch = master AND type != pull_request
23+
jobs:
24+
include:
25+
## Define the test stage that runs the linters (and testing matrix, if applicable)
826

9-
before_install:
10-
- bundle install
27+
# Run all of the linters in a single job
28+
- language: node_js
29+
node_js: lts/*
30+
env: Lint
31+
name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
32+
before_install: skip
33+
script:
34+
# Install and run `salt-lint`
35+
- pip install --user salt-lint
36+
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
37+
| xargs -I {} salt-lint {}
38+
# Install and run `yamllint`
39+
# Need at least `v1.17.0` for the `yaml-files` setting
40+
- pip install --user yamllint>=1.17.0
41+
- yamllint -s .
42+
# Install and run `rubocop`
43+
- gem install rubocop
44+
- rubocop -d
45+
# Install and run `commitlint`
46+
- npm install @commitlint/config-conventional -D
47+
- npm install @commitlint/travis-cli -D
48+
- commitlint-travis
1149

50+
## Define the rest of the matrix based on Kitchen testing
51+
# Make sure the instances listed below match up with
52+
# the `platforms` defined in `kitchen.yml`
53+
- env: INSTANCE=default-debian-10-develop-py3
54+
# - env: INSTANCE=default-ubuntu-1804-develop-py3
55+
# - env: INSTANCE=default-centos-7-develop-py3
56+
# - env: INSTANCE=default-fedora-30-develop-py3
57+
# - env: INSTANCE=default-opensuse-leap-15-develop-py3
58+
# - env: INSTANCE=default-amazonlinux-2-develop-py2
59+
# - env: INSTANCE=default-arch-base-latest-develop-py2
60+
- env: INSTANCE=default-debian-9-2019-2-py3
61+
- env: INSTANCE=default-ubuntu-1804-2019-2-py3
62+
# - env: INSTANCE=default-centos-7-2019-2-py3
63+
# - env: INSTANCE=default-fedora-30-2019-2-py3
64+
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
65+
# - env: INSTANCE=default-amazonlinux-2-2019-2-py2
66+
- env: INSTANCE=default-arch-base-latest-2019-2-py2
67+
- env: INSTANCE=default-debian-9-2018-3-py2
68+
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
69+
# - env: INSTANCE=default-centos-7-2018-3-py2
70+
# - env: INSTANCE=default-fedora-29-2018-3-py2
71+
# - env: INSTANCE=default-opensuse-leap-15-2018-3-py2
72+
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
73+
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
74+
# - env: INSTANCE=default-debian-8-2017-7-py2
75+
- env: INSTANCE=default-ubuntu-1604-2017-7-py2
76+
# - env: INSTANCE=default-centos-6-2017-7-py2
77+
# - env: INSTANCE=default-fedora-29-2017-7-py2
78+
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
79+
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
80+
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
1281

13-
env:
14-
matrix:
15-
- INSTANCE: default-ubuntu-1804
16-
- INSTANCE: default-debian-jessie
17-
- INSTANCE: default-debian-stretch
18-
- INSTANCE: version-1131-debian-jessie
19-
- INSTANCE: version-1131-debian-stretch
82+
## Define the release stage that runs `semantic-release`
83+
- stage: release
84+
language: node_js
85+
node_js: lts/*
86+
env: Release
87+
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
88+
before_install: skip
89+
script:
90+
# Update `AUTHORS.md`
91+
- export MAINTAINER_TOKEN=${GH_TOKEN}
92+
- go get github.com/myii/maintainer
93+
- maintainer contributor
2094

21-
script:
22-
- bundle exec kitchen verify ${INSTANCE}
95+
# Install all dependencies required for `semantic-release`
96+
- npm install @semantic-release/changelog@3 -D
97+
- npm install @semantic-release/exec@3 -D
98+
- npm install @semantic-release/git@7 -D
99+
deploy:
100+
provider: script
101+
skip_cleanup: true
102+
script:
103+
# Run `semantic-release`
104+
- npx semantic-release@15

‎.yamllint‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
# Extend the `default` configuration provided by `yamllint`
5+
extends: default
6+
7+
# Files to ignore completely
8+
# 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
10+
# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
11+
ignore: |
12+
node_modules/
13+
test/**/states/**/*.sls
14+
.kitchen/
15+
docker/osfamilymap.yaml
16+
17+
yaml-files:
18+
# Default settings
19+
- '*.yaml'
20+
- '*.yml'
21+
- .salt-lint
22+
- .yamllint
23+
# SaltStack Formulas additional settings
24+
- '*.example'
25+
- test/**/*.sls
26+
27+
rules:
28+
empty-values:
29+
forbid-in-block-mappings: true
30+
forbid-in-flow-mappings: true
31+
line-length:
32+
# Increase from default of `80`
33+
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
34+
max: 88
35+
octal-values:
36+
forbid-implicit-octal: true
37+
forbid-explicit-octal: true

‎FORMULA‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: docker
2+
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
3+
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4+
version: 0.41.0
5+
release: 1
6+
minimum_version: 2017.7
7+
summary: docker formula
8+
description: Formula for working with Docker
9+
top_level_dir: docker

0 commit comments

Comments
 (0)