diff options
author | Luchian Nemes <luchian.nemes@puppet.com> | 2020-09-08 12:43:15 +0300 |
---|---|---|
committer | mihaibuzgau <mihai.buzgau@puppet.com> | 2020-09-10 15:01:16 +0300 |
commit | 2de384715bff6107aad6a643f63190e05d167ec8 (patch) | |
tree | b98d624a5f4086ecf0ed3f8c89808305fdebe60b | |
parent | e65ad11c560f4b3156f80c21612212450f4426a0 (diff) | |
download | puppet-augeas_core-2de384715bff6107aad6a643f63190e05d167ec8.tar.gz puppet-augeas_core-2de384715bff6107aad6a643f63190e05d167ec8.tar.bz2 |
(maint) Remove 'puppet-module-dev' gem dependency
In preparation for the Puppet 7 release, the
`puppet-module-posix-dev-r2.7` and `puppet-module-posix-dev-r2.7` gems
had to be removed from `Gemfile` due to the following dependency error:
`puppet-module-posix-dev-r2.7` depends on
`puppet_litmus` which depends on
`bolt` which depends on
`puppet` which is locked to a version below 7
Also added the needed gems that were lost in the above removal process.
-rw-r--r-- | .github/workflows/static_code_analysis.yaml | 4 | ||||
-rw-r--r-- | .github/workflows/unit_tests_with_nightly_puppet_gem.yaml | 4 | ||||
-rw-r--r-- | .github/workflows/unit_tests_with_released_puppet_gem.yaml | 4 | ||||
-rw-r--r-- | Gemfile | 10 | ||||
-rw-r--r-- | README.md | 2 |
5 files changed, 15 insertions, 9 deletions
diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index ea06ac0..ed4a232 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -3,9 +3,9 @@ name: Static Code Analysis on: push: - branches: [ $default-branch ] + branches: [ main ] pull_request: - branches: [ $default-branch ] + branches: [ main ] jobs: static_code_analysis: diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml index 12b7230..8c5d909 100644 --- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml @@ -3,9 +3,9 @@ name: Unit Tests with nightly Puppet gem on: push: - branches: [ $default-branch ] + branches: [ main ] pull_request: - branches: [ $default-branch ] + branches: [ main ] jobs: unit_tests_with_nightly_puppet_gem: diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml index 66d64ac..065e2b9 100644 --- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml @@ -3,9 +3,9 @@ name: Unit Tests with released Puppet gem on: push: - branches: [ $default-branch ] + branches: [ main ] pull_request: - branches: [ $default-branch ] + branches: [ main ] jobs: unit_tests_with_released_puppet_gem: @@ -17,6 +17,14 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments minor_version = ruby_version_segments[0..1].join('.') group :development do + gem "parallel_tests", '>= 2.14.1', '< 2.14.3', require: false + gem "metadata-json-lint", '>= 2.0.2', '< 3.0.0', require: false + gem "rspec-puppet-facts", '~> 1.10.0', require: false + gem "rspec_junit_formatter", '~> 0.2', require: false + gem "rubocop", '~> 0.49.0', require: false + gem "rubocop-rspec", '~> 1.16.0', require: false + gem "rubocop-i18n", '~> 1.2.0', require: false + gem "puppetlabs_spec_helper", '>= 2.9.0', '< 3.0.0', require: false 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') @@ -25,9 +33,7 @@ group :development do 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-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-strings", 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 @@ -1,7 +1,7 @@ # augeas_core -[![Modules Status](https://github.com/puppetlabs/puppetlabs-augeas_core/workflows/[Daily]%20Unit%20Tests%20with%nightly%20Puppet%20gem/badge.svg?branch=main)](https://github.com/puppetlabs/puppetlabs-augeas_core/actions) +[![Modules Status](https://github.com/puppetlabs/puppetlabs-augeas_core/workflows/%5BDaily%5D%20Unit%20Tests%20with%20nightly%20Puppet%20gem/badge.svg?branch=main)](https://github.com/puppetlabs/puppetlabs-augeas_core/actions) [![Modules Status](https://github.com/puppetlabs/puppetlabs-augeas_core/workflows/Static%20Code%20Analysis/badge.svg?branch=main)](https://github.com/puppetlabs/puppetlabs-augeas_core/actions) [![Modules Status](https://github.com/puppetlabs/puppetlabs-augeas_core/workflows/Unit%20Tests%20with%20nightly%20Puppet%20gem/badge.svg?branch=main)](https://github.com/puppetlabs/puppetlabs-augeas_core/actions) [![Modules Status](https://github.com/puppetlabs/puppetlabs-augeas_core/workflows/Unit%20Tests%20with%20released%20Puppet%20gem/badge.svg?branch=main)](https://github.com/puppetlabs/puppetlabs-augeas_core/actions) |