Unverified Commit a0b98f68 authored by Tim Meusel's avatar Tim Meusel Committed by GitHub
Browse files

Merge pull request #434 from voxpupuli/modulesync 

modulesync 10.0.0-19-g1adc8e0
parents ef547157 f8107db8

.msync.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Managed by modulesync - DO NOT EDIT

# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/



modulesync_config_version: '10.0.0'
 
modulesync_config_version: '10.1.0'

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ group :development do 
end



group :system_tests do

  gem 'voxpupuli-acceptance', '~> 3.5',  :require => false

  gem 'voxpupuli-acceptance', '~> 4.0',  :require => false

end



group :release do

Rakefile

+3 −11
Original line number Diff line number Diff line 
# Managed by modulesync - DO NOT EDIT

# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/



# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),

# otherwise attempt to load it directly.

begin

  require 'voxpupuli/test/rake'

rescue LoadError

  begin

    require 'puppetlabs_spec_helper/rake_tasks'

  rescue LoadError

  end

  # only available if gem group test is installed

end



# load optional tasks for acceptance

# only available if gem group releases is installed

begin

  require 'voxpupuli/acceptance/rake'

rescue LoadError

  # only available if gem group acceptance is installed

end



# load optional tasks for releases

# only available if gem group releases is installed

begin

  require 'voxpupuli/release/rake_tasks'

rescue LoadError

  # voxpupuli-release not present

  # only available if gem group releases is installed

else

  GCGConfig.user = 'voxpupuli'

  GCGConfig.project = 'puppet-postfix'