Skip to content

Commit 5a6ed53

Browse files
committed
ci(travis): use build config validation (beta) [skip ci]
* Automated using myii/ssf-formula#97
2 parents 371bed2 + 9f217a2 commit 5a6ed53

File tree

13 files changed

+141
-263
lines changed

13 files changed

+141
-263
lines changed

.salt-lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# vim: ft=yaml
33
---
44
exclude_paths: []
5+
rules: {}
56
skip_list:
67
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
78
- 205 # Use ".sls" as a Salt State file extension

.travis.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
---
44
## Machine config
55
dist: bionic
6+
version: '~> 1.0'
67
sudo: required
78
services:
89
- docker
@@ -33,8 +34,8 @@ jobs:
3334
script:
3435
# Install and run `salt-lint`
3536
- pip install --user salt-lint
36-
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
37-
| xargs -I {} salt-lint {}
37+
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
38+
| xargs salt-lint
3839
# Install and run `yamllint`
3940
# Need at least `v1.17.0` for the `yaml-files` setting
4041
- pip install --user yamllint>=1.17.0
@@ -43,39 +44,41 @@ jobs:
4344
- gem install rubocop
4445
- rubocop -d
4546
# Install and run `commitlint`
46-
- npm install @commitlint/config-conventional -D
47-
- npm install @commitlint/travis-cli -D
47+
- npm i -D @commitlint/config-conventional
48+
@commitlint/travis-cli
4849
- commitlint-travis
4950

5051
## Define the rest of the matrix based on Kitchen testing
5152
# Make sure the instances listed below match up with
5253
# 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
54+
- env: INSTANCE=default-debian-10-master-py3
55+
# - env: INSTANCE=default-ubuntu-1804-master-py3
56+
# - env: INSTANCE=default-centos-8-master-py3
57+
# - env: INSTANCE=default-fedora-31-master-py3
58+
# - env: INSTANCE=default-opensuse-leap-151-master-py3
59+
# - env: INSTANCE=default-amazonlinux-2-master-py2
60+
# - env: INSTANCE=default-arch-base-latest-master-py2
61+
# - env: INSTANCE=default-debian-10-2019-2-py3
6062
# - env: INSTANCE=default-debian-9-2019-2-py3
6163
- 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
64+
# - env: INSTANCE=default-centos-8-2019-2-py3
65+
# - env: INSTANCE=default-fedora-31-2019-2-py3
66+
- env: INSTANCE=default-opensuse-leap-151-2019-2-py3
67+
# - env: INSTANCE=default-centos-7-2019-2-py2
6568
- env: INSTANCE=default-amazonlinux-2-2019-2-py2
66-
- env: INSTANCE=default-arch-base-latest-2019-2-py2
69+
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
70+
- env: INSTANCE=default-fedora-30-2018-3-py3
6771
# - env: INSTANCE=default-debian-9-2018-3-py2
6872
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
6973
# - 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
74+
# - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
7275
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
73-
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
76+
- env: INSTANCE=default-arch-base-latest-2018-3-py2
7477
# - env: INSTANCE=default-debian-8-2017-7-py2
7578
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
7679
- 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
80+
# - env: INSTANCE=default-fedora-30-2017-7-py2
81+
# - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
7982
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
8083
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
8184

@@ -93,9 +96,9 @@ jobs:
9396
- maintainer contributor
9497

9598
# 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+
- npm i -D @semantic-release/changelog@3
100+
@semantic-release/exec@3
101+
@semantic-release/git@7
99102
deploy:
100103
provider: script
101104
skip_cleanup: true

AUTHORS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord
44

55
Avatar|Contributor|Contributions
66
:-:|---|:-:
7+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|22
78
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|14
8-
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|10
9-
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|9
9+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|14
1010
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/776662?v=4' width='36' height='36' alt='@carlosperello'>|[@carlosperello](https://github.com/carlosperello)|4
1111
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|4
12-
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|3
12+
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|4
1313
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>|[@andrew-vant](https://github.com/andrew-vant)|2
1414
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|2
1515
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/90042?v=4' width='36' height='36' alt='@kev009'>|[@kev009](https://github.com/kev009)|2
@@ -34,4 +34,4 @@ Avatar|Contributor|Contributions
3434

3535
---
3636

37-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-17.
37+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11.

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Changelog
22

3+
## [0.22.1](https://github.com/saltstack-formulas/sudoers-formula/compare/v0.22.0...v0.22.1) (2019-10-11)
4+
5+
6+
### Bug Fixes
7+
8+
* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/652c350))
9+
* **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/sudoers-formula/commit/a10ea35))
10+
11+
12+
### Continuous Integration
13+
14+
* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/2821526))
15+
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9719ac9))
16+
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/e63f441))
17+
* **kitchen+travis:** replace EOL pre-salted images ([](https://github.com/saltstack-formulas/sudoers-formula/commit/dea2da0))
18+
* **platform:** add `arch-base-latest` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/55ce214))
19+
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/f3a98c2))
20+
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/96dcd0f))
21+
* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/sudoers-formula/commit/7b44df2))
22+
* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9df9a48))
23+
* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/sudoers-formula/commit/5e22568))
24+
325
# [0.22.0](https://github.com/saltstack-formulas/sudoers-formula/compare/v0.21.1...v0.22.0) (2019-08-17)
426

527

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: sudoers
22
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE
33
os_family: Debian, RedHat, Suse
4-
version: 0.22.0
4+
version: 0.22.1
55
release: 1
66
minimum_version: 2016.11
77
summary: Sudoers formula

docs/AUTHORS.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ This list is sorted by the number of commits per contributor in *descending* ord
1313
* - Avatar
1414
- Contributor
1515
- Contributions
16+
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
17+
- `@myii <https://github.com/myii>`_
18+
- 22
1619
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
1720
- `@nmadhok <https://github.com/nmadhok>`_
1821
- 14
1922
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
2023
- `@aboe76 <https://github.com/aboe76>`_
21-
- 10
22-
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
23-
- `@myii <https://github.com/myii>`_
24-
- 9
24+
- 14
2525
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/776662?v=4' width='36' height='36' alt='@carlosperello'>`
2626
- `@carlosperello <https://github.com/carlosperello>`_
2727
- 4
@@ -30,7 +30,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
3030
- 4
3131
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
3232
- `@daks <https://github.com/daks>`_
33-
- 3
33+
- 4
3434
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>`
3535
- `@andrew-vant <https://github.com/andrew-vant>`_
3636
- 2
@@ -98,4 +98,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
9898

9999
----
100100

101-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-08-17.
101+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-11.

docs/CHANGELOG.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22
Changelog
33
=========
44

5+
`0.22.1 <https://github.com/saltstack-formulas/sudoers-formula/compare/v0.22.0...v0.22.1>`_ (2019-10-11)
6+
------------------------------------------------------------------------------------------------------------
7+
8+
Bug Fixes
9+
^^^^^^^^^
10+
11+
12+
* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/652c350>`_\ )
13+
* **rubocop:** fix remaining errors manually (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/a10ea35>`_\ )
14+
15+
Continuous Integration
16+
^^^^^^^^^^^^^^^^^^^^^^
17+
18+
19+
* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/2821526>`_\ )
20+
* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/9719ac9>`_\ )
21+
* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/e63f441>`_\ )
22+
* **kitchen+travis:** replace EOL pre-salted images (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/dea2da0>`_\ )
23+
* **platform:** add ``arch-base-latest`` (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/55ce214>`_\ )
24+
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/f3a98c2>`_\ )
25+
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/96dcd0f>`_\ )
26+
* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/7b44df2>`_\ )
27+
* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/9df9a48>`_\ )
28+
* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ ` <https://github.com/saltstack-formulas/sudoers-formula/commit/5e22568>`_\ )
29+
530
`0.22.0 <https://github.com/saltstack-formulas/sudoers-formula/compare/v0.21.1...v0.22.0>`_ (2019-08-17)
631
------------------------------------------------------------------------------------------------------------
732

docs/CONTRIBUTING.rst

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

docs/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Contributing to this repo
3737

3838
**Commit message formatting is significant!!**
3939

40-
Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
40+
Please see `How to contribute <https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst>`_ for more details.
4141

4242
Available states
4343
----------------

0 commit comments

Comments
 (0)