summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2016-07-11 14:48:50 +0200
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2016-07-11 14:48:50 +0200
commitd143a43ffbc834f281943949e1a20a0ba00ede42 (patch)
tree4633a9cb2ef4726d6b466fc01cdfffd6b4da5098
parent6450241794803aa0f18d60edc511b93337ffd0d0 (diff)
modulesync
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile14
-rw-r--r--Rakefile6
3 files changed, 7 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 06e0cae..5b64f69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake
matrix:
fast_finish: true
include:
- - rvm: 1.8.7
- env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
diff --git a/Gemfile b/Gemfile
index 947cd8b..1c22776 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :unit_tests do
- gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/
- gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/
+ gem 'rake', :require => false
+ gem 'rspec', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint', :require => false
@@ -25,11 +25,11 @@ group :development, :unit_tests do
end
group :system_tests do
- gem 'beaker', :require => false
- gem 'beaker-rspec', :require => false
- gem 'beaker_spec_helper', :require => false
- gem 'serverspec', :require => false
- gem 'specinfra', '2.59.0', :require => false
+ gem 'beaker', :require => false
+ gem 'beaker-rspec', :require => false
+ gem 'beaker_spec_helper', :require => false
+ gem 'serverspec', :require => false
+ gem 'specinfra', :require => false
end
if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 61faa29..ab65ceb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,10 +14,4 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
unless RUBY_VERSION =~ /^1\./
require 'puppet_blacksmith'
require 'puppet_blacksmith/rake_tasks'
- #require 'github_changelog_generator/task'
- #GitHubChangelogGenerator::RakeTask.new :changelog do |config|
- # m = Blacksmith::Modulefile.new
- # config.future_release = m.version
- # config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
- #end
end