Skip to content

Commit 49f1c85

Browse files
authored
Merge pull request #118 from puppetlabs/pdksync_PDK_UPDATE
pdksync - (maint) - Pdk Update
2 parents 7c27af6 + 1483217 commit 49f1c85

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.travis.yml

Lines changed: 6 additions & 4 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
@@ -7,19 +8,20 @@ before_install:
78
- rm -f Gemfile.lock
89
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
910
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
10-
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
11+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
12+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
1113
- gem --version
1214
- bundle -v
1315
script:
1416
- 'SIMPLECOV=yes bundle exec rake $CHECK'
1517
bundler_args: --without system_tests
1618
rvm:
17-
- 2.5.3
19+
- 2.5.7
1820
stages:
1921
- static
2022
- spec
2123
- acceptance
22-
matrix:
24+
jobs:
2325
fast_finish: true
2426
include:
2527
-
@@ -31,7 +33,7 @@ matrix:
3133
stage: spec
3234
-
3335
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
34-
rvm: 2.5.3
36+
rvm: 2.5.7
3537
stage: spec
3638
-
3739
env: PUPPET_GEM_VERSION="~> 6.0.0" RSAPI_GEM_VERSION="~> 1.6.0" CHECK=parallel_spec

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ group :development do
2424
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2525
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2626
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
28-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
28+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
29+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30+
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "webmock", require: false
3232
gem "builder", '~> 3.2.2', require: false
3333
gem "puppet-strings", require: false, git: 'https://github.com/puppetlabs/puppet-strings.git', ref: 'master'

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
24
require 'puppetlabs_spec_helper/rake_tasks'
35
require 'puppet-syntax/tasks/puppet-syntax'

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"firewall",
3535
"network"
3636
],
37-
"pdk-version": "1.15.0",
37+
"pdk-version": "1.17.0",
3838
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
39-
"template-ref": "heads/master-0-gcaed9d7"
39+
"template-ref": "1.17.0-0-gd3a4319"
4040
}

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
RSpec.configure do |c|
24
c.mock_with :rspec
35
end

0 commit comments

Comments
 (0)