From b105002a3874e229d247825c13398d2c72933a71 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 8 Oct 2019 16:37:49 +0100 Subject: [PATCH 1/4] ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job * Automated using https://github.com/myii/ssf-formula/pull/60 --- .yamllint | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamllint b/.yamllint index c16f39b..740beca 100644 --- a/.yamllint +++ b/.yamllint @@ -17,6 +17,7 @@ yaml-files: # Default settings - '*.yaml' - '*.yml' + - .salt-lint - .yamllint # SaltStack Formulas additional settings - '*.example' From 5a9477eeb3d83d428895340b210dff9a7675e84e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:22:58 +0100 Subject: [PATCH 2/4] fix(rubocop): add fixes using `rubocop --safe-auto-correct` --- test/integration/default/controls/redis_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/default/controls/redis_spec.rb b/test/integration/default/controls/redis_spec.rb index ef372ab..260a761 100644 --- a/test/integration/default/controls/redis_spec.rb +++ b/test/integration/default/controls/redis_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'redis' do impact 1.0 title 'Manage Redis Server' From f336c606bdddc6c40bd025919e0b8664bd671dc2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:24:33 +0100 Subject: [PATCH 3/4] ci(travis): merge `rubocop` linter into main `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/65 --- .travis.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2612e4..4e3f22d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,17 +21,14 @@ stages: - name: release if: branch = master AND type != pull_request jobs: - allow_failures: - - env: Lint_rubocop - fast_finish: true include: ## Define the test stage that runs the linters (and testing matrix, if applicable) - # Run all of the linters in a single job (except `rubocop`) + # Run all of the linters in a single job - language: node_js node_js: lts/* env: Lint - name: 'Lint: salt-lint, yamllint & commitlint' + name: 'Lint: salt-lint, yamllint, rubocop & commitlint' before_install: skip script: # Install and run `salt-lint` @@ -42,21 +39,13 @@ jobs: # 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 # Install and run `commitlint` - npm install @commitlint/config-conventional -D - npm install @commitlint/travis-cli -D - commitlint-travis - # Run the `rubocop` linter in a separate job that is allowed to fail - # Once these lint errors are fixed, this can be merged into a single job - - language: node_js - node_js: lts/* - env: Lint_rubocop - name: 'Lint: rubocop' - before_install: skip - script: - # Install and run `rubocop` - - gem install rubocop - - rubocop -d ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with From f6df2afe44e8689f039956e6e9c0e4f096a23b0e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 11 Oct 2019 20:49:36 +0000 Subject: [PATCH 4/4] chore(release): 0.26.2 [skip ci] ## [0.26.2](https://github.com/saltstack-formulas/redis-formula/compare/v0.26.1...v0.26.2) (2019-10-11) ### Bug Fixes * **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/redis-formula/commit/5a9477e)) ### Continuous Integration * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/redis-formula/commit/b105002)) * **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/redis-formula/commit/f336c60)) --- AUTHORS.md | 4 ++-- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 4 ++-- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index f872224..d6cb7ae 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,7 +5,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @benKenob1|[@benKenob1](https://github.com/benKenob1)|51 -@myii|[@myii](https://github.com/myii)|20 +@myii|[@myii](https://github.com/myii)|24 @gravyboat|[@gravyboat](https://github.com/gravyboat)|14 @nmadhok|[@nmadhok](https://github.com/nmadhok)|13 @alex-leonhardt|[@alex-leonhardt](https://github.com/alex-leonhardt)|9 @@ -42,4 +42,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11. diff --git a/CHANGELOG.md b/CHANGELOG.md index da67223..3d8d665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.26.2](https://github.com/saltstack-formulas/redis-formula/compare/v0.26.1...v0.26.2) (2019-10-11) + + +### Bug Fixes + +* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/redis-formula/commit/5a9477e)) + + +### Continuous Integration + +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/redis-formula/commit/b105002)) +* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/redis-formula/commit/f336c60)) + ## [0.26.1](https://github.com/saltstack-formulas/redis-formula/compare/v0.26.0...v0.26.1) (2019-10-10) diff --git a/FORMULA b/FORMULA index 4715fdf..b33a647 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: redis os: Debian, Ubuntu, RedHat, Fedora, CentOS os_family: Debian, RedHat -version: 0.26.1 +version: 0.26.2 release: 1 minimum_version: 2017.7 summary: template formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4e02265..0cd44f2 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 51 * - :raw-html-m2r:`@myii` - `@myii `_ - - 20 + - 24 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 14 @@ -122,4 +122,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-11. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 17720c9..f595c52 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.26.2 `_ (2019-10-11) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` `_\ ) + `0.26.1 `_ (2019-10-10) ----------------------------------------------------------------------------------------------------------