Skip to content

Commit 1196097

Browse files
authored
Merge pull request #339 from sheenaajay/dependencyfix
(MODULES-10388) fix missing gem
2 parents 36e6954 + 50219af commit 1196097

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.sync.yml

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Gemfile:
4242
version: "~> 3.4"
4343
optional:
4444
":development":
45+
- gem: ruby-pwsh
4546
- gem: github_changelog_generator
4647
git: https://github.com/skywinder/github-changelog-generator
4748
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ before_install:
77
- rm -f Gemfile.lock
88
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
99
- "# 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'
10+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
11+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
1112
- gem --version
1213
- bundle -v
1314
script:

Gemfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ 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]
31+
gem "ruby-pwsh", require: false
3132
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3233
end
3334
group :system_tests do

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
],
5050
"pdk-version": "1.15.0",
5151
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
52-
"template-ref": "heads/master-0-gcaed9d7"
52+
"template-ref": "heads/master-0-g941e819"
5353
}

0 commit comments

Comments
 (0)