Skip to content

1.6.x mergeup #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 13, 2019
Merged

1.6.x mergeup #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6dac79
(maint) constrain test-workaround for a puppet bug
DavidS Dec 11, 2018
e5c568e
(maint) update travis for better coverage of in-flight puppet versions
DavidS Dec 11, 2018
e75756d
(maint) Remove incorrect Development section from README
DavidS Dec 11, 2018
64c97c4
Merge pull request #145 from DavidS/improve-travis
da-ar Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ matrix:
bundler: true
directories: ~/.rvm
before_install: rvm use jruby-9.1.9.0 --install --binary --fuzzy
- rvm: 2.4.3
- rvm: 2.5.1
env: CHECK=rubocop
- rvm: 2.4.3
- rvm: 2.5.1
env: CHECK=license_finder
bundler_args: ""

Expand All @@ -52,10 +52,18 @@ matrix:
env: PUPPET_GEM_VERSION='~> 4.8.0'
- rvm: 2.1.9
env: PUPPET_GEM_VERSION='~> 4.7.0'
- rvm: 2.5.1
env: PUPPET_GEM_VERSION='~> 6' # 6.0, soon 6.1
- rvm: 2.5.1
env: PUPPET_GEM_VERSION='~> 6.0'
- rvm: 2.5.1
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master'
- rvm: 2.5.1
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#6.0.x'
- rvm: 2.4.3
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#5.5.x'
- rvm: 2.1.9
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#4.10.x'
notifications:
hipchat:
rooms:
Expand Down
6 changes: 0 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,6 @@ Future possibilities:
* [Multiple Providers](https://tickets.puppetlabs.com/browse/PDK-530)
* [Commands API](https://tickets.puppetlabs.com/browse/PDK-847)

## Development

After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

## Contributing

Bug reports and pull requests are welcome on GitHub at https://github.com/puppetlabs/puppet-resource_api.
Expand Down
5 changes: 4 additions & 1 deletion spec/acceptance/device_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
end

before(:all) do
FileUtils.mkdir_p(File.expand_path('~/.puppetlabs/opt/puppet/cache/devices/the_node/state'))
if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.3.0') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('5.4.0')
# work around https://tickets.puppetlabs.com/browse/PUP-8632 and https://tickets.puppetlabs.com/browse/PUP-9047
FileUtils.mkdir_p(File.expand_path('~/.puppetlabs/opt/puppet/cache/devices/the_node/state'))
end
end

describe 'using `puppet resource`' do
Expand Down