-
Notifications
You must be signed in to change notification settings - Fork 421
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into metastate
- Loading branch information
Showing
47 changed files
with
583 additions
and
409 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -120,3 +120,7 @@ docs/*.md | |
| Dockerfile.*_* | ||
| ignore/ | ||
| tmp/ | ||
|
|
||
| #Vagrant Specific files | ||
| .vagrant | ||
| top.sls | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # vim: ft=yaml | ||
| --- | ||
| # General overrides used across formulas in the org | ||
| Metrics/LineLength: | ||
| # Increase from default of `80` | ||
| # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) | ||
| Max: 88 | ||
|
|
||
| # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # vim: ft=yaml | ||
| --- | ||
| exclude_paths: [] | ||
| rules: {} | ||
| skip_list: | ||
| # Using `salt-lint` for linting other files as well, such as Jinja macros/templates | ||
| - 205 # Use ".sls" as a Salt State file extension | ||
| # Skipping `207` and `208` because `210` is sufficient, at least for the time-being | ||
| # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755` | ||
| - 207 # File modes should always be encapsulated in quotation marks | ||
| - 208 # File modes should always contain a leading zero | ||
| tags: [] | ||
| verbosity: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,110 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # vim: ft=yaml | ||
| --- | ||
| dist: bionic | ||
| stages: | ||
| - test | ||
| - lint | ||
| - name: release | ||
| if: branch = master AND type != pull_request | ||
| ## Machine config | ||
| os: 'linux' | ||
| arch: 'amd64' | ||
| dist: 'bionic' | ||
| version: '~> 1.0' | ||
|
|
||
| sudo: required | ||
| cache: bundler | ||
| language: ruby | ||
| ## Language and cache config | ||
| language: 'ruby' | ||
| cache: 'bundler' | ||
|
|
||
| ## Services config | ||
| services: | ||
| - docker | ||
|
|
||
| # Make sure the instances listed below match up with | ||
| # the `platforms` defined in `kitchen.yml` | ||
| env: | ||
| matrix: | ||
| # The ordering used below has been selected based on the time required in Travis | ||
| # The slower ones are kept as high up as possible, to run concurrently rather than | ||
| # slow down the entire run at the end (i.e. `centos-6` and `opensuse`) | ||
| # However, the groupings needed to be maintained in some semblance of order | ||
| # so this is a best-effort matrix, in the circumstances | ||
| # - INSTANCE: v201707-py2-debian-8-2017-7-py2 | ||
| - INSTANCE: v201707-py2-ubuntu-1604-2017-7-py2 | ||
| - INSTANCE: v201707-py2-centos-6-2017-7-py2 | ||
| # - INSTANCE: v201707-py2-amazonlinux-2-2017-7-py2 | ||
| # - INSTANCE: v201803-py2-debian-9-2018-3-py2 | ||
| # - INSTANCE: v201803-py2-ubuntu-1604-2018-3-py2 | ||
| - INSTANCE: v201803-py2-centos-7-2018-3-py2 | ||
| - INSTANCE: v201803-py2-amazonlinux-2-2018-3-py2 | ||
| - INSTANCE: v201902-py2-debian-9-2019-2-py2 | ||
| - INSTANCE: v201902-py2-ubuntu-1804-2019-2-py2 | ||
| # - INSTANCE: v201902-py2-centos-7-2019-2-py2 | ||
| # - INSTANCE: v201902-py2-opensuse-leap-15-2019-2-py2 | ||
| # - INSTANCE: v201902-py2-amazonlinux-2-2019-2-py2 | ||
| # - INSTANCE: v201902-py3-debian-9-2019-2-py3 | ||
| # - INSTANCE: v201902-py3-ubuntu-1804-2019-2-py3 | ||
| # - INSTANCE: v201902-py3-centos-7-2019-2-py3 | ||
| - INSTANCE: v201902-py3-fedora-30-2019-2-py3 | ||
| - INSTANCE: v201902-py3-opensuse-leap-15-2019-2-py3 | ||
|
|
||
| ## Script to run for the test stage | ||
| script: | ||
| - bin/kitchen verify ${INSTANCE} | ||
| - bin/kitchen verify "${INSTANCE}" | ||
|
|
||
| ## Stages and jobs matrix | ||
| stages: | ||
| - test | ||
| - name: 'release' | ||
| if: 'branch = master AND type != pull_request' | ||
| jobs: | ||
| include: | ||
| # Define the `lint` stage (runs `yamllint` and `commitlint`) | ||
| - stage: lint | ||
| language: node_js | ||
| node_js: lts/* | ||
| before_install: skip | ||
| ## Define the test stage that runs the linters (and testing matrix, if applicable) | ||
|
|
||
| # Run all of the linters in a single job | ||
| - language: 'node_js' | ||
| node_js: 'lts/*' | ||
| env: 'Lint' | ||
| name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint' | ||
| before_install: 'skip' | ||
| script: | ||
| # Install and run `salt-lint` | ||
| - pip install --user salt-lint | ||
| - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst' | ||
| | xargs salt-lint | ||
| # Install and run `yamllint` | ||
| # Need at least `v1.17.0` for the `yaml-files` setting | ||
| - pip install --user yamllint>=1.17.0 | ||
| - yamllint -s . | ||
| # Install and run `rubocop` | ||
| - gem install rubocop | ||
| - rubocop -d | ||
| # Run `shellcheck` (already pre-installed in Travis) | ||
| - shellcheck --version | ||
| - git ls-files -- '*.sh' '*.bash' '*.ksh' | ||
| | xargs shellcheck | ||
| # Install and run `commitlint` | ||
| - npm install @commitlint/config-conventional -D | ||
| - npm install @commitlint/travis-cli -D | ||
| - npm i -D @commitlint/config-conventional | ||
| @commitlint/travis-cli | ||
| - commitlint-travis | ||
| # Define the release stage that runs `semantic-release` | ||
| - stage: release | ||
| language: node_js | ||
| node_js: lts/* | ||
| before_install: skip | ||
|
|
||
| ## Define the rest of the matrix based on Kitchen testing | ||
| # Make sure the instances listed below match up with | ||
| # the `platforms` defined in `kitchen.yml` | ||
| # The ordering used below has been selected based on the time required in Travis | ||
| # The slower ones are kept as high up as possible, to run concurrently rather than | ||
| # slow down the entire run at the end (i.e. `centos-6` and `opensuse`) | ||
| # However, the groupings needed to be maintained in some semblance of order | ||
| # so this is a best-effort matrix, in the circumstances | ||
| # - env: INSTANCE=v201707-py2-debian-8-2017-7-py2 | ||
| - env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2 | ||
| - env: INSTANCE=v201707-py2-centos-6-2017-7-py2 | ||
| # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2 | ||
| # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2 | ||
| - env: INSTANCE=v201803-py2-debian-9-2018-3-py2 | ||
| # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2 | ||
| - env: INSTANCE=v201803-py2-centos-7-2018-3-py2 | ||
| # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2 | ||
| # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2 | ||
| - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2 | ||
| # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2 | ||
| - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2 | ||
| # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2 | ||
| - env: INSTANCE=v201902-py3-debian-10-2019-2-py3 | ||
| # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3 | ||
| # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3 | ||
| # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3 | ||
| - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3 | ||
|
|
||
| ## Define the release stage that runs `semantic-release` | ||
| - stage: 'release' | ||
| language: 'node_js' | ||
| node_js: 'lts/*' | ||
| env: 'Release' | ||
| name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA' | ||
| before_install: 'skip' | ||
| script: | ||
| # Update `AUTHORS.md` | ||
| - export MAINTAINER_TOKEN=${GH_TOKEN} | ||
| - go get github.com/myii/maintainer | ||
| - maintainer contributor | ||
|
|
||
| # Install all dependencies required for `semantic-release` | ||
| - npm install @semantic-release/changelog@3 -D | ||
| - npm install @semantic-release/exec@3 -D | ||
| - npm install @semantic-release/git@7 -D | ||
| - npm i -D @semantic-release/changelog@3 | ||
| @semantic-release/exec@3 | ||
| @semantic-release/git@7 | ||
| deploy: | ||
| provider: script | ||
| skip_cleanup: true | ||
| script: | ||
| # Run `semantic-release` | ||
| - npx semantic-release@15 | ||
| provider: 'script' | ||
| # Opt-in to `dpl v2` to complete the Travis build config validation (beta) | ||
| # * https://docs.travis-ci.com/user/build-config-validation | ||
| # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default | ||
| edge: true | ||
| # Run `semantic-release` | ||
| script: 'npx [email protected]' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.