Showing with 44 additions and 19 deletions.
  1. +1 −1 .gitignore
  2. +3 −1 .pdkignore
  3. +1 −0 .puppet-lint.rc
  4. +2 −3 .sync.yml
  5. +20 −6 .travis.yml
  6. +9 −1 CHANGELOG.md
  7. +1 −1 Gemfile
  8. +1 −0 appveyor.yml
  9. +6 −6 metadata.json
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
/convert_report.txt
/update_report.txt
.DS_Store
.vscode/
.envrc
/inventory.yaml
4 changes: 3 additions & 1 deletion .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
/convert_report.txt
/update_report.txt
.DS_Store
.vscode/
.envrc
/inventory.yaml
/appveyor.yml
/.fixtures.yml
/Gemfile
Expand All @@ -32,8 +32,10 @@
/.gitlab-ci.yml
/.pdkignore
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/.yardopts
/spec/
/.vscode/
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--relative
5 changes: 2 additions & 3 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
- release
remove_includes:
- env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4
- env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8
rvm: 2.1.9
rvm: 2.4.5
stage: spec

Gemfile:
optional:
Expand Down
26 changes: 20 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
dist: trusty
language: ruby
cache: bundler
before_install:
Expand All @@ -12,34 +11,49 @@ script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.5.1
- 2.5.3
env:
global:
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
- GEM_BOLT=true
stages:
- static
- spec
- acceptance
-
if: tag =~ ^v\d
name: deploy
matrix:
fast_finish: true
include:
-
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
rvm: 2.5.3
script: bundle exec rake beaker
services: docker
stage: acceptance
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
rvm: 2.5.3
script: bundle exec rake beaker
services: docker
stage: acceptance
sudo: required
-
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
stage: static
-
env: CHECK=parallel_spec
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3
stage: spec
-
env: DEPLOY_TO_FORGE=yes
stage: deploy
branches:
only:
- master
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [v0.6.0](https://github.com/puppetlabs/puppetlabs-service/tree/v0.6.0) (2019-04-08)
## [v1.0.0](https://github.com/puppetlabs/puppetlabs-service/tree/v1.0.0) (2019-04-24)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/v0.6.0...v1.0.0)

### Changed

- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#91](https://github.com/puppetlabs/puppetlabs-service/pull/91) ([david22swan](https://github.com/david22swan))

## [v0.6.0](https://github.com/puppetlabs/puppetlabs-service/tree/v0.6.0) (2019-04-09)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/0.5.0...v0.6.0)

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "bolt", "~> 1.15", require: false if ENV['GEM_BOLT']
gem "bolt", '~> 1.15', require: false if ENV['GEM_BOLT']
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ version: 1.1.x.{build}
branches:
only:
- master
- release
skip_commits:
message: /^\(?doc\)?.*/
clone_depth: 10
Expand Down
12 changes: 6 additions & 6 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-service",
"version": "0.6.0",
"version": "1.0.0",
"author": "puppetlabs",
"summary": "Tasks that manipulate a service",
"license": "Apache-2.0",
Expand Down Expand Up @@ -61,11 +61,11 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 5.1.0 < 7.0.0"
"version_requirement": ">= 5.5.10 < 7.0.0"
}
],
"description": "Tasks that manipulate a service",
"pdk-version": "1.9.0",
"template-url": "https://github.com/puppetlabs/pdk-templates.git",
"template-ref": "heads/master-0-gfde5699"
}
"pdk-version": "1.10.0",
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "heads/master-0-gf778803"
}