diff --git a/.sync.yml b/.sync.yml index 019dfee..5e4519f 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,102 +1,113 @@ --- appveyor.yml: - unmanaged: true + use_litmus: true + matrix_extras: + - + RUBY_VERSION: 25-x64 + ACCEPTANCE: 'yes' + TARGET_HOST: localhost + - + RUBY_VERSION: 25-x64 + ACCEPTANCE: 'yes' + TARGET_HOST: localhost + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 .gitignore: required: - ---.project .gitlab-ci.yml: unmanaged: true .rubocop.yml: default_configs: inherit_from: .rubocop_todo.yml require: - rubocop-i18n - rubocop-rspec .travis.yml: branches: - release user: puppet secure: "" includes: - bundler_args: dist: trusty env: PLATFORMS=deb_puppet5 rvm: 2.5.3 before_script: - bundle exec rake 'litmus:provision_list[travis_deb]' - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - bundle exec rake 'litmus:install_agent[puppet5]' - bundle exec rake litmus:install_module script: - bundle exec rake litmus:acceptance:parallel services: docker stage: acceptance sudo: required - bundler_args: dist: trusty env: PLATFORM=centos:deb_puppet6 rvm: 2.5.3 before_script: - bundle exec rake 'litmus:provision_list[travis_deb]' - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - bundle exec rake 'litmus:install_agent[puppet6]' - bundle exec rake litmus:install_module script: - bundle exec rake litmus:acceptance:parallel services: docker sudo: required stage: acceptance - bundler_args: dist: trusty env: PLATFORMS=el_puppet5 rvm: 2.5.3 before_script: - bundle exec rake 'litmus:provision_list[travis_el]' - bundle exec rake 'litmus:install_agent[puppet5]' - bundle exec rake litmus:install_module script: - bundle exec rake litmus:acceptance:parallel services: docker sudo: required stage: acceptance - bundler_args: dist: trusty env: PLATFORM=centos:el_puppet6 rvm: 2.5.3 before_script: - bundle exec rake 'litmus:provision_list[travis_el]' - bundle exec rake 'litmus:install_agent[puppet6]' - bundle exec rake litmus:install_module script: - bundle exec rake litmus:acceptance:parallel services: docker stage: acceptance sudo: required Gemfile: + use_litmus: true required: ':development': - gem: puppet-lint-i18n optional: ':development': - gem: 'github_changelog_generator' git: 'https://github.com/skywinder/github-changelog-generator' ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" Rakefile: requires: - puppet_pot_generator/rake_tasks spec/spec_helper.rb: mock_with: ':rspec' coverage_report: true diff --git a/Gemfile b/Gemfile index f32ec3c..9af3abc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,74 +1,74 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' def location_for(place_or_version, fake_version = nil) git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} file_url_regex = %r{\Afile:\/\/(?.*)} if place_or_version && (git_url = place_or_version.match(git_url_regex)) [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] else [place_or_version, { require: false }] end end ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments minor_version = ruby_version_segments[0..1].join('.') group :development do gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] - gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby] gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-lint-i18n", require: false gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') end puppet_version = ENV['PUPPET_GEM_VERSION'] facter_version = ENV['FACTER_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] gems = {} gems['puppet'] = location_for(puppet_version) # If facter or hiera versions have been specified via the environment # variables gems['facter'] = location_for(facter_version) if facter_version gems['hiera'] = location_for(hiera_version) if hiera_version if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} # If we're using a Puppet gem on Windows which handles its own win32-xxx gem # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). gems['win32-dir'] = ['<= 0.4.9', require: false] gems['win32-eventlog'] = ['<= 0.6.5', require: false] gems['win32-process'] = ['<= 0.7.5', require: false] gems['win32-security'] = ['<= 0.2.5', require: false] gems['win32-service'] = ['0.8.8', require: false] end gems.each do |gem_name, gem_params| gem gem_name, *gem_params end # Evaluate Gemfile.local and ~/.gemfile if they exist extra_gemfiles = [ "#{__FILE__}.local", File.join(Dir.home, '.gemfile'), ] extra_gemfiles.each do |gemfile| if File.file?(gemfile) && File.readable?(gemfile) eval(File.read(gemfile), binding) end end # vim: syntax=ruby diff --git a/appveyor.yml b/appveyor.yml index dd5f850..ece8590 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,75 +1,81 @@ --- version: 1.1.x.{build} branches: only: - master - release skip_commits: message: /^\(?doc\)?.*/ clone_depth: 10 init: - SET - 'mkdir C:\ProgramData\PuppetLabs\code && exit 0' - 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0' - 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0' - 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0' environment: matrix: - RUBY_VERSION: 24-x64 CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop - PUPPET_GEM_VERSION: ~> 5.0 RUBY_VERSION: 24 CHECK: parallel_spec - PUPPET_GEM_VERSION: ~> 5.0 RUBY_VERSION: 24-x64 CHECK: parallel_spec - PUPPET_GEM_VERSION: ~> 6.0 RUBY_VERSION: 25 CHECK: parallel_spec - PUPPET_GEM_VERSION: ~> 6.0 RUBY_VERSION: 25-x64 CHECK: parallel_spec - RUBY_VERSION: 25-x64 ACCEPTANCE: yes TARGET_HOST: localhost - RUBY_VERSION: 25-x64 ACCEPTANCE: yes TARGET_HOST: localhost APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 for: - matrix: only: - ACCEPTANCE: yes install: - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - bundle install --jobs 4 --retry 2 - type Gemfile.lock test_script: - - bundle exec rake spec_prep - - bundle exec rake litmus:acceptance:localhost + - bundle exec puppet -V + - ruby -v + - gem -v + - bundle -v + - bundle exec rake spec_prep + - bundle exec rake litmus:acceptance:localhost +matrix: + fast_finish: true install: - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - bundle install --jobs 4 --retry 2 --without system_tests - type Gemfile.lock build: off test_script: - bundle exec puppet -V - ruby -v - gem -v - bundle -v - bundle exec rake %CHECK% notifications: - provider: Email to: - nobody@nowhere.com on_build_success: false on_build_failure: false on_build_status_changed: false