RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #340 from puppetlabs/pdksync_pdksync_heads/master-0-g6814a87

Browse Source 
pdksync - pdksync_heads/master-0-g6814a87
This commit is contained in:
Helen
2019-01-14 15:44:25 +00:00
committed by GitHub
parent be8c53be64 ed5fd0d528
commit 197bd5fe7f
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -3,9 +3,6 @@ dist: trusty
language: ruby language: ruby
cache: bundler cache: bundler
before_install: before_install:
- if [ $BUNDLER_VERSION ]; then
gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
fi
- bundle -v - bundle -v
- rm -f Gemfile.lock - rm -f Gemfile.lock
- gem update --system $RUBYGEMS_VERSION - gem update --system $RUBYGEMS_VERSION
@@ -45,9 +42,6 @@ matrix:
- -
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4 rvm: 2.4.4
-
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
rvm: 2.1.9
branches: branches:
only: only:
- master - master

3
Gemfile
View File

@@ -21,7 +21,8 @@ group :development do
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4') gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
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))
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]

2
metadata.json
View File

@@ -78,6 +78,6 @@
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates/", "template-url": "https://github.com/puppetlabs/pdk-templates/",
"template-ref": "heads/master-0-g9c815ea", "template-ref": "heads/master-0-g6814a87",
"pdk-version": "1.7.1" "pdk-version": "1.7.1"
} }