Skip to content

Commit 6e54f1a

Browse files
authored
Merge pull request #247 from voxpupuli/modulesync
modulesync 2.8.0
2 parents e9500e7 + 623871f commit 6e54f1a

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

.github/CONTRIBUTING.md

+19-4
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,34 @@ You can install all needed gems for spec tests into the modules directory by
5151
running:
5252

5353
```sh
54-
bundle install --path .vendor/ --without development system_tests release
54+
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
5555
```
5656

5757
If you also want to run acceptance tests:
5858

5959
```sh
60-
bundle install --path .vendor/ --with system_tests --without development release
60+
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
6161
```
6262

6363
Our all in one solution if you don't know if you need to install or update gems:
6464

6565
```sh
66-
bundle install --path .vendor/ --with system_tests --without development release; bundle update; bundle clean
66+
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
67+
```
68+
69+
As an alternative to the `--jobs "$(nproc)` parameter, you can set an
70+
environment variable:
71+
72+
```sh
73+
BUNDLE_JOBS="$(nproc)"
74+
```
75+
76+
### Note for OS X users
77+
78+
`nproc` isn't a valid command unter OS x. As an alternative, you can do:
79+
80+
```sh
81+
--jobs "$(sysctl -n hw.ncpu)"
6782
```
6883

6984
## Syntax and style
@@ -160,7 +175,7 @@ created virtual machines will be in `.vagrant/beaker_vagrant_files`.
160175
Beaker also supports docker containers. We also use that in our automated CI
161176
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
162177

163-
```
178+
```sh
164179
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
165180
```
166181

.msync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.7.0'
1+
modulesync_config_version: '2.8.0'

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ group :test do
2121
gem 'puppet-lint-unquoted_string-check', :require => false
2222
gem 'puppet-lint-variable_contains_upcase', :require => false
2323
gem 'puppet-lint-absolute_classname-check', :require => false
24+
gem 'puppet-lint-topscope-variable-check', :require => false
2425
gem 'metadata-json-lint', :require => false
2526
gem 'redcarpet', :require => false
2627
gem 'rubocop', '~> 0.49.1', :require => false

spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
require 'puppetlabs_spec_helper/module_spec_helper'
99
require 'rspec-puppet-facts'
10+
require 'bundler'
1011
include RspecPuppetFacts
1112

1213
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
@@ -31,6 +32,7 @@
3132
add_filter '/spec'
3233
add_filter '/vendor'
3334
add_filter '/.vendor'
35+
add_filter Bundler.configured_bundle_path.path
3436
end
3537
end
3638

0 commit comments

Comments
 (0)