Skip to content

Commit 09e425a

Browse files
authored
Merge pull request #193 from puppetlabs/hunner_msync
(MODULES-4097) Sync travis.yml
2 parents b40bf2f + 6c4bea6 commit 09e425a

File tree

3 files changed

+14
-28
lines changed

3 files changed

+14
-28
lines changed

.sync.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
---
2-
.travis.yml:
3-
extras:
4-
- rvm: 1.9.3
5-
env: PUPPET_GEM_VERSION="3.7.0"
6-
- rvm: 2.0.0
7-
env: PUPPET_GEM_VERSION="3.7.0"
82
CONTRIBUTING.md:
93
unmanaged: true
104
Gemfile:
@@ -17,10 +11,8 @@ spec/spec_helper.rb:
1711
unmanaged: true
1812
appveyor.yml:
1913
matrix_extras:
20-
- PUPPET_GEM_VERSION: 3.7.0
21-
RUBY_VER: 193
22-
- PUPPET_GEM_VERSION: 3.7.0
23-
RUBY_VER: 200-x64
14+
- PUPPET_GEM_VERSION: 4.2.3
15+
RUBY_VER: 21-x64
2416
LICENSE:
2517
license_type: 'puppetpe'
2618
NOTICE:

.travis.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1+
#This file is generated by ModuleSync, do not edit.
12
---
23
sudo: false
34
language: ruby
4-
bundler_args: --without system_tests
5-
script: "bundle exec rake validate lint spec"
5+
cache: bundler
6+
script: "bundle exec rake release_checks"
7+
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
8+
before_install:
9+
- gem update bundler
610
matrix:
711
fast_finish: true
812
include:
9-
- rvm: 1.9.3
10-
env: PUPPET_GEM_VERSION="~> 3.0"
11-
- rvm: 2.0.0
12-
env: PUPPET_GEM_VERSION="~> 3.0"
13-
- rvm: 2.1.5
14-
env: PUPPET_GEM_VERSION="~> 4.0"
1513
- rvm: 2.3.1
14+
bundler_args: --without system_tests
15+
env: PUPPET_GEM_VERSION="~> 4.0"
16+
- rvm: 2.1.7
17+
bundler_args: --without system_tests
1618
env: PUPPET_GEM_VERSION="~> 4.0"
17-
- rvm: 2.0.0
18-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
19-
- rvm: 1.9.3
20-
env: PUPPET_GEM_VERSION="3.7.0"
21-
- rvm: 2.0.0
22-
env: PUPPET_GEM_VERSION="3.7.0"
2319
notifications:
2420
email: false

appveyor.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ environment:
2222
RUBY_VER: 23
2323
- PUPPET_GEM_VERSION: ~> 4.0
2424
RUBY_VER: 23-x64
25-
- PUPPET_GEM_VERSION: 3.7.0
26-
RUBY_VER: 193
27-
- PUPPET_GEM_VERSION: 3.7.0
28-
RUBY_VER: 200-x64
25+
- PUPPET_GEM_VERSION: 4.2.3
26+
RUBY_VER: 21-x64
2927
matrix:
3028
fast_finish: true
3129
install:

0 commit comments

Comments
 (0)