From c2185ea61de9f8afafbe4c6f53d7a40a85402ba2 Mon Sep 17 00:00:00 2001 From: "Adrien \"ze\" Urban" Date: Tue, 22 May 2018 15:07:25 +0200 Subject: [PATCH 01/18] refresh: add multiple repo, but only refresh once --- apt/repositories.sls | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apt/repositories.sls b/apt/repositories.sls index 08614f2..27d9467 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -74,6 +74,16 @@ - keyserver: {{ r_keyserver }} {% endif %} - clean_file: true + - refresh: False + - refresh_db: False + - onchanges_in: + - module: apt.refresh_db {%- endfor %} {% endfor %} + +{% if repositories %} +apt.refresh_db: + module.run: + - name: pkg.refresh_db +{% endif %} From 57bfc61b2c8b79e09d51da58d11d3eaf34a50085 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sat, 10 Aug 2019 21:45:47 +0200 Subject: [PATCH 02/18] fix(fluorine): add name so no virtual_packages --- apt/repositories.sls | 3 ++- apt/transports/debtorrent.sls | 3 ++- apt/transports/https.sls | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apt/repositories.sls b/apt/repositories.sls index dd866bf..3be454d 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -8,7 +8,8 @@ {% set keyring_package = apt.get('keyring_package', apt_map.default_keyring_package) %} {{ keyring_package }}: - pkg.installed + pkg.installed: + - name: {{ keyring_package }} /etc/apt/sources.list: file.managed: diff --git a/apt/transports/debtorrent.sls b/apt/transports/debtorrent.sls index 43d9fb7..fc8ff12 100644 --- a/apt/transports/debtorrent.sls +++ b/apt/transports/debtorrent.sls @@ -1,2 +1,3 @@ apt-transport-debtorrent: - pkg.installed + pkg.installed: + - name: apt-transport-debtorrent diff --git a/apt/transports/https.sls b/apt/transports/https.sls index 073bfcf..ab8e1f8 100644 --- a/apt/transports/https.sls +++ b/apt/transports/https.sls @@ -1,2 +1,3 @@ apt-transport-https: - pkg.installed + pkg.installed: + - name: apt-transport-https From f23f4df283834554707325e0ea98257c71210ad6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 10 Oct 2019 15:22:53 +0100 Subject: [PATCH 03/18] chore(issues): remove issues templates to use org-level templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/61 --- .github/ISSUE_TEMPLATE/bug_report.md | 68 ----------------------- .github/ISSUE_TEMPLATE/feature_request.md | 42 -------------- 2 files changed, 110 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 1cc8c26..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,68 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '[BUG] ' -labels: 'bug' -assignees: '' - ---- - - - -## Your setup -### Formula commit hash / release tag - - - - -### Versions reports (master & minion) - - - - -### Pillar / config used - - - - ---- - -## Bug details -### Describe the bug - - - - -### Steps to reproduce the bug - - - - - - -### Expected behaviour - - - - -### Attempts to fix the bug - - - - -### Additional context - - - - ---- - -### Meta: How can this template be improved? - - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index be8be36..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '[FEATURE] ' -labels: 'enhancement' -assignees: '' - ---- - - - -### Is your feature request related to a problem? - - - - -### Describe the solution you'd like - - - - -### Describe alternatives you've considered - - - - -### Additional context - - - - ---- - -### Meta: How can this template be improved? - - - From d2630f7cf15a30528e7d06e0efcb4d237bb35ea2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 11:31:37 +0100 Subject: [PATCH 04/18] docs(readme): update link to `CONTRIBUTING` [skip ci] --- docs/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.rst b/docs/README.rst index b476bdf..beb6127 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -37,7 +37,7 @@ Contributing to this repo **Commit message formatting is significant!!** -Please see :ref:`How to contribute ` for more details. +Please see `How to contribute `_ for more details. Available states ---------------- From b2662ce3723cccd045ec96342e5ba3e364813398 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 12:17:19 +0100 Subject: [PATCH 05/18] docs(contributing): remove to use org-level file instead [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/70 --- docs/CONTRIBUTING.rst | 159 ------------------------------------------ 1 file changed, 159 deletions(-) delete mode 100644 docs/CONTRIBUTING.rst diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst deleted file mode 100644 index b7da8f4..0000000 --- a/docs/CONTRIBUTING.rst +++ /dev/null @@ -1,159 +0,0 @@ -.. _contributing: - -How to contribute -================= - -This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one. -What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo. -It also covers how to contribute to this *formula's documentation*. - -.. contents:: **Table of Contents** - -Overview --------- - -Submitting a pull request is more than just code! -To achieve a quality product, the *tests* and *documentation* need to be updated as well. -An excellent pull request will include these in the changes, wherever relevant. - -Commit message formatting -------------------------- - -Since every type of change requires making Git commits, -we will start by covering the importance of ensuring that all of your commit -messages are in the correct format. - -Automation of multiple processes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `semantic-release `_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog. -The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation. - -Full details are available in the upstream docs regarding the `Angular Commit Message Conventions `_. -The key factor is that the first line of the commit message must follow this format: - -.. code-block:: - - type(scope): subject - - -* E.g. ``docs(contributing): add commit message formatting instructions``. - -Besides the version bump, the changelog and release notes are formatted accordingly. -So based on the example above: - -.. - - .. raw:: html - -

Documentation

- - * **contributing:** add commit message formatting instructions - - -* The ``type`` translates into a ``Documentation`` sub-heading. -* The ``(scope):`` will be shown in bold text without the brackets. -* The ``subject`` follows the ``scope`` as standard text. - -Linting commit messages in Travis CI -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `commitlint `_ for checking commit messages during CI testing. -This ensures that they are in accordance with the ``semantic-release`` settings. - -For more details about the default settings, refer back to the ``commitlint`` `reference rules `_. - -Relationship between commit type and version bump -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula applies some customisations to the defaults, as outlined in the table below, -based upon the `type `_ of the commit: - -.. list-table:: - :name: commit-type-vs-version-bump - :header-rows: 1 - :stub-columns: 0 - :widths: 1,2,3,1,1 - - * - Type - - Heading - - Description - - Bump (default) - - Bump (custom) - * - ``build`` - - Build System - - Changes related to the build system - - – - - - * - ``chore`` - - – - - Changes to the build process or auxiliary tools and libraries such as - documentation generation - - – - - - * - ``ci`` - - Continuous Integration - - Changes to the continuous integration configuration - - – - - - * - ``docs`` - - Documentation - - Documentation only changes - - – - - 0.0.1 - * - ``feat`` - - Features - - A new feature - - 0.1.0 - - - * - ``fix`` - - Bug Fixes - - A bug fix - - 0.0.1 - - - * - ``perf`` - - Performance Improvements - - A code change that improves performance - - 0.0.1 - - - * - ``refactor`` - - Code Refactoring - - A code change that neither fixes a bug nor adds a feature - - – - - 0.0.1 - * - ``revert`` - - Reverts - - A commit used to revert a previous commit - - – - - 0.0.1 - * - ``style`` - - Styles - - Changes that do not affect the meaning of the code (white-space, - formatting, missing semi-colons, etc.) - - – - - 0.0.1 - * - ``test`` - - Tests - - Adding missing or correcting existing tests - - – - - 0.0.1 - -Use ``BREAKING CHANGE`` to trigger a ``major`` version change -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used. -This will be appended to the changelog and release notes as well. -To preserve good formatting of these notes, the following format is prescribed: - -* ``BREAKING CHANGE: .`` - -An example of that: - -.. code-block:: git - - ... - - BREAKING CHANGE: With the removal of all of the `.sls` files under - `template package`, this formula no longer supports the installation of - packages. - From fdb7822dc834da315222bdd092f486a30f0936d0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 23 Oct 2019 17:30:28 +0100 Subject: [PATCH 06/18] ci(travis): update `salt-lint` config for `v0.0.10` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/82 --- .salt-lint | 1 + 1 file changed, 1 insertion(+) diff --git a/.salt-lint b/.salt-lint index a539954..3715677 100644 --- a/.salt-lint +++ b/.salt-lint @@ -2,6 +2,7 @@ # 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 From 0506a5c5db540d669cd0a61c16016f5cf3040037 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 18:03:53 +0100 Subject: [PATCH 07/18] ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/84 --- .travis.yml | 4 ++-- kitchen.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad1855a..64e0b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,8 @@ jobs: ## 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` - - env: INSTANCE=repositories-debian-10-develop-py3 - # - env: INSTANCE=preferences-debian-10-develop-py3 + - env: INSTANCE=repositories-debian-10-master-py3 + # - env: INSTANCE=preferences-debian-10-master-py3 # - env: INSTANCE=repositories-ubuntu-1804-develop-py3 # - env: INSTANCE=preferences-ubuntu-1804-develop-py3 - env: INSTANCE=repositories-debian-9-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index 3b06985..f566471 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,13 +11,13 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` - - name: debian-10-develop-py3 + ## SALT `develop` => `master` + - name: debian-10-master-py3 driver: - image: netmanagers/salt-develop-py3:debian-10 + image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: ubuntu-1804-develop-py3 driver: image: netmanagers/salt-develop-py3:ubuntu-18.04 From 6187515e4395349448c6d0b4519c9037197a1a88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Oct 2019 04:45:22 +0000 Subject: [PATCH 08/18] ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/86 --- .travis.yml | 8 ++++---- kitchen.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64e0b63..4630e86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -51,9 +51,9 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=repositories-debian-10-master-py3 - # - env: INSTANCE=preferences-debian-10-master-py3 - # - env: INSTANCE=repositories-ubuntu-1804-develop-py3 - # - env: INSTANCE=preferences-ubuntu-1804-develop-py3 + - env: INSTANCE=preferences-debian-10-master-py3 + # - env: INSTANCE=repositories-ubuntu-1804-master-py3 + # - env: INSTANCE=preferences-ubuntu-1804-master-py3 - env: INSTANCE=repositories-debian-9-2019-2-py3 - env: INSTANCE=preferences-debian-9-2019-2-py3 - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index f566471..8d44ff7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,19 +11,19 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` => `master` + ## SALT `master` - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - - name: ubuntu-1804-develop-py3 + - name: ubuntu-1804-master-py3 driver: - image: netmanagers/salt-develop-py3:ubuntu-18.04 + image: netmanagers/salt-master-py3:ubuntu-18.04 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master ## SALT `2019.2` - name: debian-9-2019-2-py3 From ca4ba6e370a0885689931d6919b89cf5d77517ce Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 10:33:27 +0000 Subject: [PATCH 09/18] fix(release.config.js): use full commit hash in commit link [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/89 --- .travis.yml | 10 +++++----- release.config.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4630e86..545807a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,8 @@ jobs: - gem install rubocop - rubocop -d # 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 rest of the matrix based on Kitchen testing @@ -73,9 +73,9 @@ jobs: - 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 diff --git a/release.config.js b/release.config.js index afa0cb1..6af7aa8 100644 --- a/release.config.js +++ b/release.config.js @@ -63,7 +63,7 @@ module.exports = { } if (typeof commit.hash === `string`) { - commit.hash = commit.hash.substring(0, 7) + commit.shortHash = commit.hash.substring(0, 7) } if (typeof commit.subject === `string`) { From 9d5102cb96be9ee2faa371940b6321663e97ce5f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 2 Nov 2019 08:41:29 +0000 Subject: [PATCH 10/18] perf(travis): improve `salt-lint` invocation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/90 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 545807a..dbb48d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ jobs: # Install and run `salt-lint` - pip install --user salt-lint - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' - | xargs -I {} salt-lint {} + | 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 From cf6a735ebb500657bb534badb2287a55f2e1c683 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 13 Nov 2019 16:51:02 +0000 Subject: [PATCH 11/18] ci(travis): use build config validation (beta) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/97 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dbb48d3..dfacacd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ --- ## Machine config dist: bionic +version: '~> 1.0' sudo: required services: - docker From 5bd314b90d8f90ddc2d702fdf256f90eeca1e358 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 16 Nov 2019 20:08:43 +0000 Subject: [PATCH 12/18] ci(travis): apply changes from build config validation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/98 --- .travis.yml | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfacacd..77afe18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,18 @@ # vim: ft=yaml --- ## Machine config -dist: bionic +os: 'linux' +arch: 'amd64' +dist: 'bionic' version: '~> 1.0' -sudo: required -services: - - docker ## Language and cache config -language: ruby -cache: bundler +language: 'ruby' +cache: 'bundler' + +## Services config +services: + - docker ## Script to run for the test stage script: @@ -19,18 +22,18 @@ script: ## Stages and jobs matrix stages: - test - - name: release - if: branch = master AND type != pull_request + - name: 'release' + if: 'branch = master AND type != pull_request' jobs: include: ## 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 + - language: 'node_js' + node_js: 'lts/*' + env: 'Lint' name: 'Lint: salt-lint, yamllint, rubocop & commitlint' - before_install: skip + before_install: 'skip' script: # Install and run `salt-lint` - pip install --user salt-lint @@ -61,12 +64,12 @@ jobs: - env: INSTANCE=preferences-ubuntu-1804-2019-2-py3 ## Define the release stage that runs `semantic-release` - - stage: release - language: node_js - node_js: lts/* - env: 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 + before_install: 'skip' script: # Update `AUTHORS.md` - export MAINTAINER_TOKEN=${GH_TOKEN} @@ -78,8 +81,9 @@ jobs: @semantic-release/exec@3 @semantic-release/git@7 deploy: - provider: script + provider: 'script' + # Using deprecated `skip_cleanup` until `cleanup: false` works reliably + # cleanup: false skip_cleanup: true - script: - # Run `semantic-release` - - npx semantic-release@15 + # Run `semantic-release` + script: 'npx semantic-release@15' From 0e4d9056b124a155ceacbcf92449b50c909fff2f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 20 Nov 2019 16:28:41 +0000 Subject: [PATCH 13/18] ci(travis): opt-in to `dpl v2` to complete build config validation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/100 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77afe18..bf74748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,9 @@ jobs: @semantic-release/git@7 deploy: provider: 'script' - # Using deprecated `skip_cleanup` until `cleanup: false` works reliably - # cleanup: false - skip_cleanup: true + # 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 semantic-release@15' From 8230b8b2f26703011f1e3654da19f7c6dafbb6cc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 27 Nov 2019 20:11:29 +0000 Subject: [PATCH 14/18] ci(travis): run `shellcheck` during lint job [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/106 --- .travis.yml | 10 +++++++--- pre-commit_semantic-release.sh | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf74748..1cf50d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,13 +32,13 @@ jobs: - language: 'node_js' node_js: 'lts/*' env: 'Lint' - name: 'Lint: salt-lint, yamllint, rubocop & commitlint' + 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 | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' - | xargs 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 @@ -46,6 +46,10 @@ jobs: # 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 i -D @commitlint/config-conventional @commitlint/travis-cli diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh index 9d34d74..ba80535 100755 --- a/pre-commit_semantic-release.sh +++ b/pre-commit_semantic-release.sh @@ -14,9 +14,9 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA sudo -H pip install m2r # Copy and then convert the `.md` docs -cp *.md docs/ -cd docs/ -m2r --overwrite *.md +cp ./*.md docs/ +cd docs/ || exit +m2r --overwrite ./*.md # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst` sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst From 4303495139f4577d7d0bedd934811aaa2b8aa2f6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 27 Nov 2019 21:45:27 +0000 Subject: [PATCH 15/18] fix(travis): quote pathspecs used with `git ls-files` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/107 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1cf50d1..326bb65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst + - 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 @@ -48,7 +48,7 @@ jobs: - rubocop -d # Run `shellcheck` (already pre-installed in Travis) - shellcheck --version - - git ls-files -- *.sh *.bash *.ksh + - git ls-files -- '*.sh' '*.bash' '*.ksh' | xargs shellcheck # Install and run `commitlint` - npm i -D @commitlint/config-conventional From 5178f0d13facfa4aa27b73f2f76648dbeb486207 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Dec 2019 13:36:59 +0000 Subject: [PATCH 16/18] ci(gemfile): restrict `train` gem version until upstream fix [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/110 --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 5a232b6..8da7a69 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,7 @@ source 'https://rubygems.org' gem 'kitchen-docker', '>= 2.9' gem 'kitchen-inspec', '>= 1.1' gem 'kitchen-salt', '>= 0.6.0' +# Latest versions of `train` cause failure when running `kitchen verify` +# Downgrading to `3.2.0` until this is fixed upstream +# https://github.com/inspec/train/pull/544#issuecomment-566055052 +gem 'train', '3.2.0' From 49ee29ce9ee371992225f5393f0f89811afdaeab Mon Sep 17 00:00:00 2001 From: Felipe Zipitria Date: Sun, 8 Dec 2019 19:18:52 -0500 Subject: [PATCH 17/18] feat(unattended): add newer options from upstream * upstream has new options now included in formula * updated pillar.example with new options * inspec tests for this new options are in place Also: * tests are included in travis Signed-off-by: Felipe Zipitria --- .travis.yml | 20 +++++--- apt/templates/unattended_config.jinja | 39 +++++++++++++-- kitchen.yml | 16 ++++++ pillar.example | 16 +++++- test/integration/unattended/README.md | 50 +++++++++++++++++++ .../unattended/controls/unattended_spec.rb | 46 +++++++++++++++++ test/integration/unattended/inspec.yml | 11 ++++ test/salt/pillar/unattended.pillar.sls | 33 ++++++++++++ 8 files changed, 220 insertions(+), 11 deletions(-) create mode 100644 test/integration/unattended/README.md create mode 100644 test/integration/unattended/controls/unattended_spec.rb create mode 100644 test/integration/unattended/inspec.yml create mode 100644 test/salt/pillar/unattended.pillar.sls diff --git a/.travis.yml b/.travis.yml index 326bb65..807f475 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,14 +58,22 @@ jobs: ## 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` - - env: INSTANCE=repositories-debian-10-master-py3 - - env: INSTANCE=preferences-debian-10-master-py3 - # - env: INSTANCE=repositories-ubuntu-1804-master-py3 + # - env: INSTANCE=repositories-debian-10-master-py3 + # - env: INSTANCE=preferences-debian-10-master-py3 + # - env: INSTANCE=unattended-debian-10-master-py3 + - env: INSTANCE=debian-10-master-py3 + - env: INSTANCE=repositories-ubuntu-1804-master-py3 # - env: INSTANCE=preferences-ubuntu-1804-master-py3 - - env: INSTANCE=repositories-debian-9-2019-2-py3 + # - env: INSTANCE=unattended-ubuntu-1804-master-py3 + # - env: INSTANCE=ubuntu-1804-master-py3 + # - env: INSTANCE=repositories-debian-9-2019-2-py3 - env: INSTANCE=preferences-debian-9-2019-2-py3 - - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3 - - env: INSTANCE=preferences-ubuntu-1804-2019-2-py3 + # - env: INSTANCE=unattended-debian-9-2019-2-py3 + # - env: INSTANCE=debian-9-2019-2-py3 + # - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3 + # - env: INSTANCE=preferences-ubuntu-1804-2019-2-py3 + - env: INSTANCE=unattended-ubuntu-1804-2019-2-py3 + # - env: INSTANCE=ubuntu-1804-2019-2-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/apt/templates/unattended_config.jinja b/apt/templates/unattended_config.jinja index ba97d00..3530b40 100644 --- a/apt/templates/unattended_config.jinja +++ b/apt/templates/unattended_config.jinja @@ -1,3 +1,8 @@ +######################################################################## +# File managed by Salt at <{{ source }}>. +# Your changes will be overwritten. +######################################################################## + {% set apt = pillar.get('apt', {}) -%} {% set unattended = apt.get('unattended', {}) -%} {% set allowed_origins = unattended.get('allowed_origins', ['${distro_id}:${distro_codename}-security']) -%} @@ -6,12 +11,28 @@ {% set auto_fix_interrupted_dpkg = unattended.get('auto_fix_interrupted_dpkg', 'true') -%} {% set minimal_steps = unattended.get('minimal_steps', 'false') -%} {% set install_on_shutdown = unattended.get('install_on_shutdown', 'false') -%} -{% set mail = unattended.get('mail', 'root') -%} +{% set mail = unattended.get('mail', '') -%} +{% set sender = unattended.get('sender', 'root') -%} {% set mail_only_on_error = unattended.get('mail_only_on_error', 'false') -%} -{% set remove_unused_dependencies = unattended.get('remove_unused_dependencies', 'true') -%} +{% set mail_report = unattended.get('mail_report', 'on-change') -%} +{% if mail_only_on_error -%} +{% set mail_report = 'only-on-error' -%} +{% endif -%} +{% if mail_report not in ['always', 'only-on-error', 'on-change'] -%} +{{ raise('apt-formula: mail_report should be one of "always", "only-on-error" or "on-change".') }} +{% endif -%} +{% set remove_unused_dependencies = unattended.get('remove_unused_dependencies', 'false') -%} +{% set remove_new_unused_dependencies = unattended.get('remove_new_unused_dependencies', 'true') -%} {% set automatic_reboot = unattended.get('automatic_reboot', 'false') -%} {% set automatic_reboot_time = unattended.get('automatic_reboot_time', 'now') -%} {% set dl_limit = unattended.get('dl_limit', '0') -%} +{% set syslog_enable = unattended.get('syslog_enable', 'false') -%} +{% set syslog_facility = unattended.get('syslog_facility', 'daemon') -%} +{% set package_whitelist_strict = unattended.get('package_whitelist_strict', 'false') -%} +{% set keep_debs_after_install = unattended.get('keep_debs_after_install', 'false') -%} +{% set dpkg_options = unattended.get('dpkg_options', '') -%} +{% set update_days = unattended.get('update_days', '') -%} + Unattended-Upgrade::Allowed-Origins { {%- for pattern in allowed_origins %} "{{ pattern }}"; @@ -31,8 +52,20 @@ Unattended-Upgrade::AutoFixInterruptedDpkg "{{ auto_fix_interrupted_dpkg }}"; Unattended-Upgrade::MinimalSteps "{{ minimal_steps }}"; Unattended-Upgrade::InstallOnShutdown "{{ install_on_shutdown }}"; Unattended-Upgrade::Mail "{{ mail }}"; -Unattended-Upgrade::MailOnlyOnError "{{ mail_only_on_error }}"; +Unattended-Upgrade::Sender "{{ sender }}"; +Unattended-Upgrade::MailReport "{{ mail_report }}"; Unattended-Upgrade::Remove-Unused-Dependencies "{{ remove_unused_dependencies }}"; +Unattended-Upgrade::Remove-New-Unused-Dependencies "{{ remove_new_unused_dependencies }}"; Unattended-Upgrade::Automatic-Reboot "{{ automatic_reboot }}"; Unattended-Upgrade::Automatic-Reboot-Time "{{ automatic_reboot_time }}"; +Unattended-Upgrade::SyslogEnable "{{ syslog_enable }}"; +Unattended-Upgrade::SyslogFacility "{{ syslog_facility }}"; +Unattended-Upgrade::Keep-Debs-After-Install "{{ keep_debs_after_install }}"; +Unattended-Upgrade::Package-Whitelist-Strict "{{ package_whitelist_strict }}"; +{% if update_days and update_days | is_list -%} +Unattended-Upgrade::Update-Days {"{{ update_days | join('";"') }}"}; +{% endif -%} Acquire::http::Dl-Limit "{{ dl_limit }}"; +{% if dpkg_options -%} +Dpkg::Options {"{{ dpkg_options }}"}; +{% endif -%} diff --git a/kitchen.yml b/kitchen.yml index 8d44ff7..9439176 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -85,3 +85,19 @@ suites: verifier: inspec_tests: - path: test/integration/preferences + - name: unattended + provisioner: + state_top: + base: + '*': + - apt.unattended + pillars: + top.sls: + base: + '*': + - apt + pillars_from_files: + apt.sls: test/salt/pillar/unattended.pillar.sls + verifier: + inspec_tests: + - path: test/integration/unattended diff --git a/pillar.example b/pillar.example index 7d5bef2..c8c6634 100644 --- a/pillar.example +++ b/pillar.example @@ -48,7 +48,11 @@ apt: minimal_steps: false install_on_shutdown: false mail: root - mail_only_on_error: false + sender: root + # Prefer using `mail_report: 'only-on-error'` over old syntax, + # mail_only_on_error: false` + # allowed values: 'always', 'only-on-error', 'on-change' + mail_report: 'only-on-error' remove_unused_dependencies: true automatic_reboot: false dl_limit: 0 @@ -58,6 +62,12 @@ apt: unattended_upgrade: 1 auto_clean_interval: 7 verbose: 2 + syslog_enable: true + syslog_facility: 'auth' + dpkg_options: '--force-confold' + update_days: ['Mon', 'Fri'] + package_whitelist_strict: false + keep_debs_after_install: false listchanges: profiles: @@ -78,12 +88,14 @@ apt: comps: [main, contrib, non-free] arch: [amd64, i386] type: [binary, source] + key_url: https://ftp-master.debian.org/keys/archive-key-10-security.asc updates: distro: stable-updates url: http://deb.debian.org/debian/ comps: [main, contrib, non-free] + key_url: https://ftp-master.debian.org/keys/archive-key-10.asc raspbian: - distro: wheezy + distro: stable url: http://archive.raspbian.org/raspbian type: [source] key_url: https://archive.raspbian.org/raspbian.public.key diff --git a/test/integration/unattended/README.md b/test/integration/unattended/README.md new file mode 100644 index 0000000..f4c979b --- /dev/null +++ b/test/integration/unattended/README.md @@ -0,0 +1,50 @@ +# InSpec Profile: `unattended` + +This shows the implementation of the `unattended` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). + +## Verify a profile + +InSpec ships with built-in features to verify a profile structure. + +```bash +$ inspec check unattended +Summary +------- +Location: unattended +Profile: profile +Controls: 4 +Timestamp: 2019-06-24T23:09:01+00:00 +Valid: true + +Errors +------ + +Warnings +-------- +``` + +## Execute a profile + +To run all **supported** controls on a local machine use `inspec exec /path/to/profile`. + +```bash +$ inspec exec unattended +.. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +8 examples, 0 failures +``` + +## Execute a specific control from a profile + +To run one control from the profile use `inspec exec /path/to/profile --controls name`. + +```bash +$ inspec exec unattended --controls package +. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +1 examples, 0 failures +``` + +See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb). diff --git a/test/integration/unattended/controls/unattended_spec.rb b/test/integration/unattended/controls/unattended_spec.rb new file mode 100644 index 0000000..93ef0e6 --- /dev/null +++ b/test/integration/unattended/controls/unattended_spec.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +audit = command( + "/usr/bin/apt-config dump --no-empty --format '%f=%v%n' Unattended-Upgrade" +).stdout + +options = { + assignment_regex: /^\s*([^=]*?)\s*=\s*(.*?)\s*$/, + multiple_values: true +} + +control 'Apt unattended upgrades' do + title 'should be configured' + + describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + end + + describe file('/etc/apt/apt.conf.d/10periodic') do + it { should exist } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + its(:content) do + should match( + 'APT::Periodic::Enable "1";' + ) + end + end + + describe parse_config(audit, options) do + its('Unattended-Upgrade::Allowed-Origins::') { should include 'origin1' } + its('Unattended-Upgrade::Mail') { should include 'root' } + its('Unattended-Upgrade::MailReport') { should include 'only-on-error' } + its('Unattended-Upgrade::Package-Blacklist::') { should include 'salt-test' } + its('Unattended-Upgrade::Automatic-Reboot') { should include 'False' } + its('Unattended-Upgrade::SyslogEnable') { should include 'True' } + its('Unattended-Upgrade::SyslogFacility') { should include 'auth' } + its('Unattended-Upgrade::Remove-Unused-Dependencies') { should include 'True' } + its('Unattended-Upgrade::Keep-Debs-After-Install') { should include 'False' } + its('Unattended-Upgrade::Update-Days::') { should include 'Wed' } + end +end diff --git a/test/integration/unattended/inspec.yml b/test/integration/unattended/inspec.yml new file mode 100644 index 0000000..c832c01 --- /dev/null +++ b/test/integration/unattended/inspec.yml @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: unattended +title: apt formula +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: Verify that the apt unattended preferences are configured correctly +supports: + - platform-name: debian + - platform-name: ubuntu diff --git a/test/salt/pillar/unattended.pillar.sls b/test/salt/pillar/unattended.pillar.sls new file mode 100644 index 0000000..b81bb1b --- /dev/null +++ b/test/salt/pillar/unattended.pillar.sls @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +apt: + unattended: + allowed_origins: + - origin1 + package_blacklist: + - salt-test + origins_patterns: + - origin=SaltStack + - origin=Debian,archive=stable,label=Debian-Security + auto_fix_interrupted_dpkg: true + minimal_steps: false + install_on_shutdown: false + mail: root + sender: root + mail_report: 'always' + remove_unused_dependencies: true + automatic_reboot: false + dl_limit: 0 + enabled: 1 + update_package_lists: 1 + download_upgradeable_packages: 1 + unattended_upgrade: 1 + auto_clean_interval: 7 + verbose: 2 + syslog_enable: true + syslog_facility: 'auth' + dpkg_options: '--force-confold' + update_days: ['Mon', 'Wed'] + package_whitelist_strict: false + keep_debs_after_install: false From b9c2e2df2108804f8b313ac4bc14c8652e0a4622 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 18 Dec 2019 19:15:48 +0000 Subject: [PATCH 18/18] chore(release): 0.10.0 [skip ci] # [0.10.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.9.1...v0.10.0) (2019-12-18) ### Bug Fixes * **fluorine:** add name so no virtual_packages ([57bfc61](https://github.com/saltstack-formulas/apt-formula/commit/57bfc61b2c8b79e09d51da58d11d3eaf34a50085)) * **release.config.js:** use full commit hash in commit link [skip ci] ([ca4ba6e](https://github.com/saltstack-formulas/apt-formula/commit/ca4ba6e370a0885689931d6919b89cf5d77517ce)) * **travis:** quote pathspecs used with `git ls-files` [skip ci] ([4303495](https://github.com/saltstack-formulas/apt-formula/commit/4303495139f4577d7d0bedd934811aaa2b8aa2f6)) ### Continuous Integration * **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([5178f0d](https://github.com/saltstack-formulas/apt-formula/commit/5178f0d13facfa4aa27b73f2f76648dbeb486207)) * **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([0506a5c](https://github.com/saltstack-formulas/apt-formula/commit/0506a5c5db540d669cd0a61c16016f5cf3040037)) * **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([6187515](https://github.com/saltstack-formulas/apt-formula/commit/6187515e4395349448c6d0b4519c9037197a1a88)) * **travis:** apply changes from build config validation [skip ci] ([5bd314b](https://github.com/saltstack-formulas/apt-formula/commit/5bd314b90d8f90ddc2d702fdf256f90eeca1e358)) * **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([0e4d905](https://github.com/saltstack-formulas/apt-formula/commit/0e4d9056b124a155ceacbcf92449b50c909fff2f)) * **travis:** run `shellcheck` during lint job [skip ci] ([8230b8b](https://github.com/saltstack-formulas/apt-formula/commit/8230b8b2f26703011f1e3654da19f7c6dafbb6cc)) * **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([fdb7822](https://github.com/saltstack-formulas/apt-formula/commit/fdb7822dc834da315222bdd092f486a30f0936d0)) * **travis:** use build config validation (beta) [skip ci] ([cf6a735](https://github.com/saltstack-formulas/apt-formula/commit/cf6a735ebb500657bb534badb2287a55f2e1c683)) ### Documentation * **contributing:** remove to use org-level file instead [skip ci] ([b2662ce](https://github.com/saltstack-formulas/apt-formula/commit/b2662ce3723cccd045ec96342e5ba3e364813398)) * **readme:** update link to `CONTRIBUTING` [skip ci] ([d2630f7](https://github.com/saltstack-formulas/apt-formula/commit/d2630f7cf15a30528e7d06e0efcb4d237bb35ea2)) ### Features * **unattended:** add newer options from upstream ([49ee29c](https://github.com/saltstack-formulas/apt-formula/commit/49ee29ce9ee371992225f5393f0f89811afdaeab)) ### Performance Improvements * **travis:** improve `salt-lint` invocation [skip ci] ([9d5102c](https://github.com/saltstack-formulas/apt-formula/commit/9d5102cb96be9ee2faa371940b6321663e97ce5f)) --- AUTHORS.md | 7 ++++--- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 17 ++++++++++------- docs/CHANGELOG.rst | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 11 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 91eaa6c..bcc8324 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: +@myii|[@myii](https://github.com/myii)|35 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|26 -@myii|[@myii](https://github.com/myii)|19 @gravyboat|[@gravyboat](https://github.com/gravyboat)|12 @bmcclure|[@bmcclure](https://github.com/bmcclure)|8 +@aboe76|[@aboe76](https://github.com/aboe76)|8 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 -@aboe76|[@aboe76](https://github.com/aboe76)|7 @nmadhok|[@nmadhok](https://github.com/nmadhok)|7 @boltronics|[@boltronics](https://github.com/boltronics)|5 @jdkelleher|[@jdkelleher](https://github.com/jdkelleher)|5 @@ -18,6 +18,7 @@ Avatar|Contributor|Contributions @techhat|[@techhat](https://github.com/techhat)|3 @whiteinge|[@whiteinge](https://github.com/whiteinge)|3 @devster31|[@devster31](https://github.com/devster31)|3 +@fzipi|[@fzipi](https://github.com/fzipi)|1 @jerrykan|[@jerrykan](https://github.com/jerrykan)|1 @rpatterson|[@rpatterson](https://github.com/rpatterson)|1 @simonclausen|[@simonclausen](https://github.com/simonclausen)|1 @@ -26,4 +27,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-09. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-18. diff --git a/CHANGELOG.md b/CHANGELOG.md index ac0387d..f3001db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,42 @@ # Changelog +# [0.10.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.9.1...v0.10.0) (2019-12-18) + + +### Bug Fixes + +* **fluorine:** add name so no virtual_packages ([57bfc61](https://github.com/saltstack-formulas/apt-formula/commit/57bfc61b2c8b79e09d51da58d11d3eaf34a50085)) +* **release.config.js:** use full commit hash in commit link [skip ci] ([ca4ba6e](https://github.com/saltstack-formulas/apt-formula/commit/ca4ba6e370a0885689931d6919b89cf5d77517ce)) +* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([4303495](https://github.com/saltstack-formulas/apt-formula/commit/4303495139f4577d7d0bedd934811aaa2b8aa2f6)) + + +### Continuous Integration + +* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([5178f0d](https://github.com/saltstack-formulas/apt-formula/commit/5178f0d13facfa4aa27b73f2f76648dbeb486207)) +* **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([0506a5c](https://github.com/saltstack-formulas/apt-formula/commit/0506a5c5db540d669cd0a61c16016f5cf3040037)) +* **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([6187515](https://github.com/saltstack-formulas/apt-formula/commit/6187515e4395349448c6d0b4519c9037197a1a88)) +* **travis:** apply changes from build config validation [skip ci] ([5bd314b](https://github.com/saltstack-formulas/apt-formula/commit/5bd314b90d8f90ddc2d702fdf256f90eeca1e358)) +* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([0e4d905](https://github.com/saltstack-formulas/apt-formula/commit/0e4d9056b124a155ceacbcf92449b50c909fff2f)) +* **travis:** run `shellcheck` during lint job [skip ci] ([8230b8b](https://github.com/saltstack-formulas/apt-formula/commit/8230b8b2f26703011f1e3654da19f7c6dafbb6cc)) +* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([fdb7822](https://github.com/saltstack-formulas/apt-formula/commit/fdb7822dc834da315222bdd092f486a30f0936d0)) +* **travis:** use build config validation (beta) [skip ci] ([cf6a735](https://github.com/saltstack-formulas/apt-formula/commit/cf6a735ebb500657bb534badb2287a55f2e1c683)) + + +### Documentation + +* **contributing:** remove to use org-level file instead [skip ci] ([b2662ce](https://github.com/saltstack-formulas/apt-formula/commit/b2662ce3723cccd045ec96342e5ba3e364813398)) +* **readme:** update link to `CONTRIBUTING` [skip ci] ([d2630f7](https://github.com/saltstack-formulas/apt-formula/commit/d2630f7cf15a30528e7d06e0efcb4d237bb35ea2)) + + +### Features + +* **unattended:** add newer options from upstream ([49ee29c](https://github.com/saltstack-formulas/apt-formula/commit/49ee29ce9ee371992225f5393f0f89811afdaeab)) + + +### Performance Improvements + +* **travis:** improve `salt-lint` invocation [skip ci] ([9d5102c](https://github.com/saltstack-formulas/apt-formula/commit/9d5102cb96be9ee2faa371940b6321663e97ce5f)) + ## [0.9.1](https://github.com/saltstack-formulas/apt-formula/compare/v0.9.0...v0.9.1) (2019-10-09) diff --git a/FORMULA b/FORMULA index bca4a2a..b09e0fa 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.9.1 +version: 0.10.0 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index f489c83..09b1e3f 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,23 +13,23 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 35 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - 26 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 19 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 12 * - :raw-html-m2r:`@bmcclure` - `@bmcclure `_ - 8 - * - :raw-html-m2r:`@arthurlogilab` - - `@arthurlogilab `_ - - 7 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ + - 8 + * - :raw-html-m2r:`@arthurlogilab` + - `@arthurlogilab `_ - 7 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ @@ -55,6 +55,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@devster31` - `@devster31 `_ - 3 + * - :raw-html-m2r:`@fzipi` + - `@fzipi `_ + - 1 * - :raw-html-m2r:`@jerrykan` - `@jerrykan `_ - 1 @@ -74,4 +77,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-09. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-18. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 0321dc9..7e40f01 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,49 @@ Changelog ========= +`0.10.0 `_ (2019-12-18) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **fluorine:** add name so no virtual_packages (\ `57bfc61 `_\ ) +* **release.config.js:** use full commit hash in commit link [skip ci] (\ `ca4ba6e `_\ ) +* **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `4303495 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `5178f0d `_\ ) +* **kitchen:** use ``debian-10-master-py3`` instead of ``develop`` [skip ci] (\ `0506a5c `_\ ) +* **kitchen+travis:** upgrade matrix after ``2019.2.2`` release [skip ci] (\ `6187515 `_\ ) +* **travis:** apply changes from build config validation [skip ci] (\ `5bd314b `_\ ) +* **travis:** opt-in to ``dpl v2`` to complete build config validation [skip ci] (\ `0e4d905 `_\ ) +* **travis:** run ``shellcheck`` during lint job [skip ci] (\ `8230b8b `_\ ) +* **travis:** update ``salt-lint`` config for ``v0.0.10`` [skip ci] (\ `fdb7822 `_\ ) +* **travis:** use build config validation (beta) [skip ci] (\ `cf6a735 `_\ ) + +Documentation +^^^^^^^^^^^^^ + + +* **contributing:** remove to use org-level file instead [skip ci] (\ `b2662ce `_\ ) +* **readme:** update link to ``CONTRIBUTING`` [skip ci] (\ `d2630f7 `_\ ) + +Features +^^^^^^^^ + + +* **unattended:** add newer options from upstream (\ `49ee29c `_\ ) + +Performance Improvements +^^^^^^^^^^^^^^^^^^^^^^^^ + + +* **travis:** improve ``salt-lint`` invocation [skip ci] (\ `9d5102c `_\ ) + `0.9.1 `_ (2019-10-09) -----------------------------------------------------------------------------------------------------