Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
language: ruby
install: true
script: "script/cibuild"
before_install: gem install bundler

matrix:
include:
# Puppet supports ruby 2.4 with Puppet >= 5.0 so this should be considered the "official" build
- rvm: 2.4
env: RUBOCOP_TEST="true" RSPEC_TEST="true" PUPPET_VERSIONS="5.4.0" ENFORCE_COVERAGE="true"
env: RUBOCOP_TEST="true" RSPEC_TEST="true" PUPPET_VERSIONS="5.5.8" ENFORCE_COVERAGE="true"
# Build with latest ruby
- rvm: 2.5
env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.4.0"
env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.5.8"
# Puppet supports ruby 2.0 and 2.1 with Puppet 4.x, but build with more recent versions too
- rvm: 2.3
env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.10"
Expand Down
4 changes: 2 additions & 2 deletions octocatalog-diff.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'json'

DEFAULT_PUPPET_VERSION = '5.4.0'.freeze
DEFAULT_PUPPET_VERSION = '5.5.8'.freeze

Gem::Specification.new do |s|
s.required_ruby_version = '>= 2.0.0'
Expand Down Expand Up @@ -30,7 +30,7 @@ EOF
s.add_runtime_dependency 'rugged', '>= 0.25.0b2'

s.add_development_dependency 'rspec', '~> 3.4.0'
s.add_development_dependency 'rake', '11.2.2'
s.add_development_dependency 'rake', '12.3.1'
s.add_development_dependency 'parallel_tests', '2.7.1'
s.add_development_dependency 'rspec-retry', '0.5.0'

Expand Down
Binary file removed vendor/cache/ast-2.3.0.gem
Binary file not shown.
Binary file added vendor/cache/ast-2.4.0.gem
Binary file not shown.
Binary file removed vendor/cache/diffy-3.2.0.gem
Binary file not shown.
Binary file added vendor/cache/diffy-3.2.1.gem
Binary file not shown.
Binary file removed vendor/cache/hiera-3.4.2.gem
Binary file not shown.
Binary file added vendor/cache/hiera-3.4.5.gem
Binary file not shown.
Binary file removed vendor/cache/httparty-0.15.6.gem
Binary file not shown.
Binary file added vendor/cache/httparty-0.16.2.gem
Binary file not shown.
Binary file added vendor/cache/httparty-0.16.3.gem
Binary file not shown.
Binary file added vendor/cache/mime-types-3.2.2.gem
Binary file not shown.
Binary file added vendor/cache/mime-types-data-3.2018.0812.gem
Binary file not shown.
Binary file added vendor/cache/multi_json-1.13.1.gem
Binary file not shown.
Binary file removed vendor/cache/parallel-1.12.0.gem
Binary file not shown.
Binary file added vendor/cache/parallel-1.12.1.gem
Binary file not shown.
Binary file removed vendor/cache/parser-2.4.0.0.gem
Binary file not shown.
Binary file added vendor/cache/parser-2.5.3.0.gem
Binary file not shown.
Binary file removed vendor/cache/powerpack-0.1.1.gem
Binary file not shown.
Binary file added vendor/cache/powerpack-0.1.2.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-5.4.0-universal-darwin.gem
Binary file not shown.
Binary file removed vendor/cache/puppet-5.4.0.gem
Binary file not shown.
Binary file added vendor/cache/puppet-5.5.8-universal-darwin.gem
Binary file not shown.
Binary file added vendor/cache/puppet-5.5.8.gem
Binary file not shown.
Binary file removed vendor/cache/rake-11.2.2.gem
Binary file not shown.
Binary file added vendor/cache/rake-12.3.1.gem
Binary file not shown.
Binary file added vendor/cache/ruby-progressbar-1.10.0.gem
Binary file not shown.
Binary file removed vendor/cache/ruby-progressbar-1.9.0.gem
Binary file not shown.
Binary file removed vendor/cache/rugged-0.26.0.gem
Binary file not shown.
Binary file added vendor/cache/rugged-0.27.5.gem
Binary file not shown.
Binary file removed vendor/cache/unicode-display_width-1.3.0.gem
Binary file not shown.
Binary file added vendor/cache/unicode-display_width-1.4.0.gem
Binary file not shown.