Merge pull request #185 from cmurphy/master
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:08:22 +0000 (12:08 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:08:22 +0000 (12:08 -0700)
Synchronize .travis.yml

.sync.yml
.travis.yml
Gemfile

index dd55f49..6fa460a 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,21 +1,6 @@
 ---
 .travis.yml:
-  env_matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.3.0"
-  additional:
-  -
-    configs:
-      after_success:
-      - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-      - .forge-release/publish
-  -
-    configs:
-      before_install:
-      - gem update --system 2.1.11
-      - gem --version
-      comments:
-      - Temporary workaround for broken Rubygems on Travis
+  script: "\"bundle exec rake spec SPEC_OPTS='--format documentation'\""
 Rakefile:
   unmanaged: true
 spec/spec_helper.rb:
index ef2a36e..c72d5e2 100644 (file)
@@ -1,33 +1,17 @@
 ---
-branches:
-  only:
-    - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.3.0"
 matrix:
   fast_finish: true
-  exclude:
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
-after_success:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-- .forge-release/publish
-before_install:
-- gem update --system 2.1.11
-- gem --version
-comments:
-- Temporary workaround for broken Rubygems on Travis
-
diff --git a/Gemfile b/Gemfile
index 9074f1e..e960f7c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,12 @@ group :development, :test do
   gem 'simplecov',               :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else