Skip to content

Commit

Permalink
(HC-94) Second module sync
Browse files Browse the repository at this point in the history
Over the course of this work there were more changes made to the
moduelsync_configs, so sync hocon a second time to get the updates.
  • Loading branch information
HAIL9000 committed Nov 3, 2016
1 parent 60ed5db commit 80da6e1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ sudo: false
language: ruby
cache: bundler
script: "bundle exec rake validate lint spec"
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
before_install:
- gem update bundler
matrix:
fast_finish: true
include:
Expand Down
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ group :development, :unit_tests do
gem 'puppetlabs_spec_helper', '>= 1.2.1'
gem 'rspec-puppet', '>= 2.3.2'
gem 'rspec-puppet-facts'
gem 'mocha', '< 1.2.0'
gem 'simplecov'
gem 'parallel_tests'
gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
gem 'rubocop' if RUBY_VERSION >= '2.0.0'
gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
Expand All @@ -41,7 +43,7 @@ group :system_tests do
gem 'beaker-hostgenerator', *location_from_env('BEAKER_HOSTGENERATOR_VERSION', [])
end
group :default do
gem 'hocon'
gem 'hocon', '~> 1.2'
end

gem 'facter', *location_from_env('FACTER_GEM_VERSION')
Expand Down

0 comments on commit 80da6e1

Please sign in to comment.