diff --git a/.sync.yml b/.sync.yml index 5edd12c..157c745 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,98 +1,100 @@ --- ".gitlab-ci.yml": delete: true ".rubocop.yml": default_configs: inherit_from: ".rubocop_todo.yml" require: - rubocop-i18n - rubocop-rspec ".travis.yml": + deploy_to_forge: + enabled: false 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 simplecov: true appveyor.yml: 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 simplecov: true 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/.travis.yml b/.travis.yml index 1fe7ec9..4d91b53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,95 +1,89 @@ --- dist: xenial language: ruby cache: bundler before_install: - bundle -v - rm -f Gemfile.lock - gem update --system $RUBYGEMS_VERSION - gem --version - bundle -v script: - 'SIMPLECOV=yes bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - 2.5.3 stages: - static - spec - acceptance - - - if: tag =~ ^v\d - name: deploy matrix: fast_finish: true include: - env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" stage: static - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec rvm: 2.4.5 stage: spec - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.3 stage: spec - 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"] bundler_args: dist: trusty env: PLATFORMS=deb_puppet5 rvm: 2.5.3 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance sudo: required - 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"] bundler_args: dist: trusty env: PLATFORM=centos:deb_puppet6 rvm: 2.5.3 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance sudo: required - before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] bundler_args: dist: trusty env: PLATFORMS=el_puppet5 rvm: 2.5.3 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance sudo: required - before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] bundler_args: dist: trusty env: PLATFORM=centos:el_puppet6 rvm: 2.5.3 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance sudo: required - - - env: DEPLOY_TO_FORGE=yes - stage: deploy branches: only: - master - /^v\d/ - release notifications: email: false deploy: provider: puppetforge user: puppet password: secure: "" on: tags: true all_branches: true condition: "$DEPLOY_TO_FORGE = yes" diff --git a/metadata.json b/metadata.json index c5cf079..173ae2a 100644 --- a/metadata.json +++ b/metadata.json @@ -1,116 +1,116 @@ { "name": "puppetlabs-concat", "version": "6.1.0", "author": "puppetlabs", "summary": "Construct files from multiple fragments.", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-concat", "project_page": "https://github.com/puppetlabs/puppetlabs-concat", "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.1 < 7.0.0" }, { "name": "puppetlabs/translate", "version_requirement": ">= 1.0.0 < 3.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", "6", "7", "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "5", "6", "7", "8" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "5", "6", "7" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "SLES", "operatingsystemrelease": [ "11 SP1", "12", "15" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "8", "9", "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", "16.04", "18.04" ] }, { "operatingsystem": "Solaris", "operatingsystemrelease": [ "10", "11" ] }, { "operatingsystem": "Windows", "operatingsystemrelease": [ "2008 R2", "2012", "2012 R2", "2016", "2012 R2 Core", "7", "8.1", "10" ] }, { "operatingsystem": "AIX", "operatingsystemrelease": [ "5.3", "6.1", "7.1" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 5.5.10 < 7.0.0" } ], "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-gfaf9e8b", + "template-ref": "heads/master-0-g643529a", "pdk-version": "1.14.1" }