From a0e812a6cf12d528ab7f761fc10fc7874f503216 Mon Sep 17 00:00:00 2001 From: Daniel Helgenberger Date: Thu, 10 Aug 2017 13:13:06 +0200 Subject: [PATCH 1/2] Fix puppet lint output format - Uses the newer style output format for puppet-lint, witch is failing for more recent puppet versions otherwise - Removes STDERR pipe to `/dev/null` to make errors more transparent. --- hooks/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 378ecdb..bcf0dcc 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -78,7 +78,7 @@ do fi # puppet-lint check - puppet-lint $PUPPETLINT_FLAGS --log-format "${file}:%{linenumber} %{KIND} - %{message}" $TMPFILE 2> /dev/null + puppet-lint $PUPPETLINT_FLAGS --log-format "${file}:%{line} %{KIND} - %{message}" $TMPFILE if [[ $? -ne 0 ]] ; then STATUS=2 fi From fa95a87bd667423da53fb5aa3d2977209478db72 Mon Sep 17 00:00:00 2001 From: Daniel Helgenberger Date: Thu, 10 Aug 2017 13:42:40 +0200 Subject: [PATCH 2/2] Update build settings Remove EOL puppet 2.7, add puppet 4.10 --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96eaf51..82e1890 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,8 @@ before_script: - 'bundle install' language: ruby rvm: - - 1.8.7 - - 1.9.2 - 1.9.3 + - 2.1.9 env: - - PUPPET_VERSION=2.7.23 - - PUPPET_VERSION=3.0.2 - - PUPPET_VERSION=3.1.1 - - PUPPET_VERSION=3.2.4 + - PUPPET_VERSION=3.8.5 + - PUPPET_VERSION=4.10.5