From 50e522fefb7b32407abe5d2bcde51cfe286057c5 Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 6 Feb 2019 15:55:17 +0000 Subject: [PATCH 1/2] (MODULES-8604) - 3.2.0 Release Prep --- CHANGELOG.md | 7 +++++++ metadata.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 358a0f0..815d955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Unsupported Release 3.2.0 +### Summary +This is a moderate release that serves to increases the maximum compatible puppet version from `5.x` to `6.x`. + +#### Added +- Maximum compatible puppet version has been increased from from `5.x` to `6.x`. + ## Unsupported Release 3.1.0 ### Summary This is a moderate release that serves to increases the maximum compatible version of stdlib from `5.0.0` to `6.0.0`. diff --git a/metadata.json b/metadata.json index 6510b63..1553e56 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-xinetd", - "version": "3.1.0", + "version": "3.2.0", "author": "puppetlabs", "summary": "Configures xinetd and exposes the xinetd::service definition for adding new services.", "license": "Apache-2.0", From d3faf6cd3db15bfaff9c9864a3512c20f719d0e4 Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 6 Feb 2019 16:28:59 +0000 Subject: [PATCH 2/2] (maint) - Update to travis.yml so it matches the supported modules --- .travis.yml | 65 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 607d529..404c71c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,49 @@ -#This file is generated by ModuleSync, do not edit. --- -sudo: false +dist: trusty language: ruby cache: bundler -script: "bundle exec rake release_checks" +before_install: + - bundle -v + - rm -f Gemfile.lock + - gem update --system $RUBYGEMS_VERSION + - gem --version + - bundle -v +script: + - 'bundle exec rake $CHECK' +bundler_args: --without system_tests +rvm: + - 2.5.1 +env: + global: + - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0" matrix: fast_finish: true include: - - rvm: 2.3.1 - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 - script: bundle exec rake beaker - services: docker - sudo: required - - rvm: 2.3.1 - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 - script: bundle exec rake beaker - services: docker - sudo: required - - rvm: 2.5.1 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 6.0" - - rvm: 2.4.1 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 5.0" - - rvm: 2.1.9 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 4.0" + - + bundler_args: + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply + rvm: 2.5.1 + script: bundle exec rake beaker + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply + rvm: 2.5.1 + script: bundle exec rake beaker + services: docker + sudo: required + - + env: CHECK=parallel_spec + - + env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec + rvm: 2.4.4 +branches: + only: + - master + - /^v\d/ + - release notifications: email: false