diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2016-01-27 08:36:03 -0800 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2016-01-27 08:36:03 -0800 |
| commit | 990e1d757549a9c792cf5f7113e4d6bcd592ae3d (patch) | |
| tree | de16abca42952b1e96c9157c3ccb9e2d096f028b | |
| parent | 2a510169d6eb8be7155064e2b9569227e65f7d3c (diff) | |
| parent | 7ff944daa0b124dc7f423e7eda351119780eda18 (diff) | |
| download | puppet-stdlib-990e1d757549a9c792cf5f7113e4d6bcd592ae3d.tar.gz puppet-stdlib-990e1d757549a9c792cf5f7113e4d6bcd592ae3d.tar.bz2 | |
Merge pull request #569 from DavidS/fm-4049-update-msync
(FM-4049) update to modulesync_configs
| -rw-r--r-- | .gitignore | 20 | ||||
| -rw-r--r-- | .rspec | 4 | ||||
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 6 |
4 files changed, 18 insertions, 24 deletions
@@ -1,12 +1,10 @@ -/pkg/ -/Gemfile.lock -/vendor/ -/spec/fixtures/manifests/* -/spec/fixtures/modules/* -!/spec/fixtures/modules/stdlib -!/spec/fixtures/modules/stdlib/* -/.vagrant/ -/.bundle/ -/coverage/ -/.idea/ +pkg/ +Gemfile.lock +vendor/ +spec/fixtures/ +.vagrant/ +.bundle/ +coverage/ +log/ +.idea/ *.iml @@ -1,4 +1,2 @@ --color ---format -progress ---backtrace +--format documentation diff --git a/.travis.yml b/.travis.yml index 6fad7a4..160b371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,13 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake matrix: fast_finish: true include: - - rvm: 1.8.7 + - rvm: 2.1.6 + env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" + - rvm: 2.1.5 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 2.1.5 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.1.5 - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.1.5 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - - rvm: 2.1.6 - env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" notifications: email: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1cbde4..bfeaa70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date: With all dependencies in place and up-to-date we can now run the tests: ```shell -% rake spec +% bundle exec rake spec ``` This will execute all the [rspec tests](http://rspec-puppet.com/) tests @@ -178,8 +178,8 @@ installed on your system. You can run them by issuing the following command ```shell -% rake spec_clean -% rspec spec/acceptance +% bundle exec rake spec_clean +% bundle exec rspec spec/acceptance ``` This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), |