Skip to content

Commit 1898784

Browse files
authored
Merge pull request #34 from EncoreTechnologies/feature/pdk-1.17.0
PDK sync to 1.17.0
2 parents 9e59a3c + 9c4a42b commit 1898784

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
os: linux
23
dist: xenial
34
language: ruby
45
cache: bundler
@@ -15,15 +16,15 @@ script:
1516
- 'bundle exec rake $CHECK'
1617
bundler_args: --without system_tests
1718
rvm:
18-
- 2.5.3
19+
- 2.5.7
1920
stages:
2021
- static
2122
- spec
2223
- acceptance
2324
-
2425
if: tag =~ ^v\d
2526
name: deploy
26-
matrix:
27+
jobs:
2728
fast_finish: true
2829
include:
2930
-
@@ -35,7 +36,7 @@ matrix:
3536
stage: spec
3637
-
3738
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
38-
rvm: 2.5.3
39+
rvm: 2.5.7
3940
stage: spec
4041
-
4142
env: DEPLOY_TO_FORGE=yes

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ All notable changes to this project will be documented in this file.
1818
* Added documentation for patching with PE and `pcp` timeouts. (Documentation) #28
1919

2020
Contributed by Nick Maludy (@nmaludy)
21+
22+
* PDK sync to 1.17.0 template (Enhancement)
23+
24+
Contributed by Nick Maludy (@nmaludy)
2125

2226
## Release 0.5.0 (2020-02-20)
2327

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"version_requirement": ">= 4.10.0 < 7.0.0"
8080
}
8181
],
82-
"pdk-version": "1.16.0",
83-
"template-url": "https://github.com/puppetlabs/pdk-templates#1.16.0",
84-
"template-ref": "tags/1.16.0-0-gaf44904"
82+
"pdk-version": "1.17.0",
83+
"template-url": "https://github.com/puppetlabs/pdk-templates#1.17.0",
84+
"template-ref": "tags/1.17.0-0-gd3a4319"
8585
}

0 commit comments

Comments
 (0)