diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c54fbf97..a291d3e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,73 +1,10 @@ name: CI on: [push, pull_request, workflow_dispatch] jobs: - puppet-4-10-10: + puppet-7-30-0: env: - PUPPET_VERSIONS: "4.10.10" - PUPPET_VERSION: "4.10.10" - RUBOCOP_TEST: false - RSPEC_TEST: true - runs-on: ubuntu-latest - permissions: - contents: read - strategy: - fail-fast: false - matrix: - ruby-version: ["2.6"] - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Build container - run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}} - - name: Tests - run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild - - puppet-5-5-22: - env: - PUPPET_VERSIONS: "5.5.22" - PUPPET_VERSION: "5.5.22" - RUBOCOP_TEST: false - RSPEC_TEST: true - runs-on: ubuntu-latest - permissions: - contents: read - strategy: - fail-fast: false - matrix: - ruby-version: ["2.6"] - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Build container - run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}} - - name: Tests - run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild - - puppet-6-18-0: - env: - PUPPET_VERSIONS: "6.18.0" - PUPPET_VERSION: "6.18.0" - RUBOCOP_TEST: false - RSPEC_TEST: true - runs-on: ubuntu-latest - permissions: - contents: read - strategy: - fail-fast: false - matrix: - ruby-version: ["2.6"] - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Build container - run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}} - - name: Tests - run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild - - puppet-7-3-0: - env: - PUPPET_VERSIONS: "7.3.0" - PUPPET_VERSION: "7.3.0" + PUPPET_VERSIONS: "7.30.0" + PUPPET_VERSION: "7.30.0" RUBOCOP_TEST: false RSPEC_TEST: true runs-on: ubuntu-latest diff --git a/.version b/.version index 7ec1d6db..276cbf9e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.1.0 +2.3.0 diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index eccebced..08d7203a 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -1,6 +1,6 @@ require 'json' -DEFAULT_PUPPET_VERSION = '5.5.22'.freeze +DEFAULT_PUPPET_VERSION = '7.30.0'.freeze Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0' diff --git a/script/bootstrap b/script/bootstrap index 8807dc62..0e3b55b8 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -14,7 +14,11 @@ set +e echo 'Running bundler' cd "${DIR}" && \ rm -f Gemfile.lock && \ - bundle install --without='' --no-prune --path vendor/bundle --local && \ + bundle config set --local no_prune 'true' && \ + bundle config set --local path 'vendor/bundle' && \ + bundle config set --local without '' && \ + + bundle install --local && \ bundle binstubs puppet rake rspec-core rubocop parallel_tests && \ chmod 0755 bin/octocatalog-diff if [ $? -ne 0 ]; then diff --git a/spec/octocatalog-diff/tests/catalog-util/command_spec.rb b/spec/octocatalog-diff/tests/catalog-util/command_spec.rb index 872fdd1e..7a25cae1 100644 --- a/spec/octocatalog-diff/tests/catalog-util/command_spec.rb +++ b/spec/octocatalog-diff/tests/catalog-util/command_spec.rb @@ -74,14 +74,8 @@ expect { testobj.puppet_command }.to raise_error(Errno::ENOENT, /Puppet binary.*doesn't exist/) end - it 'should use "master --compile" when Puppet version is 5.x' do - testobj = OctocatalogDiff::CatalogUtil::Command.new(@default_opts.merge(puppet_version: '5.5.20')) - result = testobj.puppet_command - expect(result).to match(/master --compile/) - end - - it 'should use "catalog compile" when Puppet version is 6.x' do - testobj = OctocatalogDiff::CatalogUtil::Command.new(@default_opts.merge(puppet_version: '6.5.0')) + it 'should use "catalog compile" when Puppet version is 7.x' do + testobj = OctocatalogDiff::CatalogUtil::Command.new(@default_opts.merge(puppet_version: '7.30.0')) result = testobj.puppet_command expect(result).to match(/catalog compile/) end @@ -158,8 +152,8 @@ expect(result).to match(%r{--config_version="/bin/echo catalogscript"}) end - it 'should not include config_version when Puppet version >= 6' do - testobj = OctocatalogDiff::CatalogUtil::Command.new(@default_opts.merge(puppet_version: '6.18.0')) + it 'should not include config_version when Puppet version >= 7' do + testobj = OctocatalogDiff::CatalogUtil::Command.new(@default_opts.merge(puppet_version: '7.30.0')) result = testobj.puppet_command expect(result).not_to match(/--config_version=/) end diff --git a/vendor/cache/CFPropertyList-2.2.8.gem b/vendor/cache/CFPropertyList-2.2.8.gem deleted file mode 100644 index adf1cf0c..00000000 Binary files a/vendor/cache/CFPropertyList-2.2.8.gem and /dev/null differ diff --git a/vendor/cache/CFPropertyList-2.3.6.gem b/vendor/cache/CFPropertyList-2.3.6.gem new file mode 100644 index 00000000..45b9bbf3 Binary files /dev/null and b/vendor/cache/CFPropertyList-2.3.6.gem differ diff --git a/vendor/cache/ast-2.4.0.gem b/vendor/cache/ast-2.4.0.gem deleted file mode 100644 index b5db3ed6..00000000 Binary files a/vendor/cache/ast-2.4.0.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.1.7.gem b/vendor/cache/concurrent-ruby-1.1.7.gem deleted file mode 100644 index ae9b3702..00000000 Binary files a/vendor/cache/concurrent-ruby-1.1.7.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.3.4.gem b/vendor/cache/concurrent-ruby-1.3.4.gem new file mode 100644 index 00000000..a656fd0a Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.3.4.gem differ diff --git a/vendor/cache/deep_merge-1.2.1.gem b/vendor/cache/deep_merge-1.2.1.gem deleted file mode 100644 index ee9d198f..00000000 Binary files a/vendor/cache/deep_merge-1.2.1.gem and /dev/null differ diff --git a/vendor/cache/deep_merge-1.2.2.gem b/vendor/cache/deep_merge-1.2.2.gem new file mode 100644 index 00000000..24b400ce Binary files /dev/null and b/vendor/cache/deep_merge-1.2.2.gem differ diff --git a/vendor/cache/diff-lcs-1.3.gem b/vendor/cache/diff-lcs-1.3.gem deleted file mode 100644 index ae5a5f92..00000000 Binary files a/vendor/cache/diff-lcs-1.3.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.5.0.gem b/vendor/cache/diff-lcs-1.5.0.gem deleted file mode 100644 index 3a258520..00000000 Binary files a/vendor/cache/diff-lcs-1.5.0.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.5.1.gem b/vendor/cache/diff-lcs-1.5.1.gem new file mode 100644 index 00000000..c070cb0d Binary files /dev/null and b/vendor/cache/diff-lcs-1.5.1.gem differ diff --git a/vendor/cache/diffy-3.2.1.gem b/vendor/cache/diffy-3.2.1.gem deleted file mode 100644 index ef957ac4..00000000 Binary files a/vendor/cache/diffy-3.2.1.gem and /dev/null differ diff --git a/vendor/cache/facter-2.5.1-universal-darwin.gem b/vendor/cache/facter-2.5.1-universal-darwin.gem deleted file mode 100644 index 022db51e..00000000 Binary files a/vendor/cache/facter-2.5.1-universal-darwin.gem and /dev/null differ diff --git a/vendor/cache/facter-2.5.1.gem b/vendor/cache/facter-2.5.1.gem deleted file mode 100644 index d1db3efd..00000000 Binary files a/vendor/cache/facter-2.5.1.gem and /dev/null differ diff --git a/vendor/cache/facter-2.5.7.gem b/vendor/cache/facter-2.5.7.gem deleted file mode 100644 index 0c49e7c5..00000000 Binary files a/vendor/cache/facter-2.5.7.gem and /dev/null differ diff --git a/vendor/cache/facter-4.9.0.gem b/vendor/cache/facter-4.9.0.gem new file mode 100644 index 00000000..07ab5d6e Binary files /dev/null and b/vendor/cache/facter-4.9.0.gem differ diff --git a/vendor/cache/fast_gettext-1.1.2.gem b/vendor/cache/fast_gettext-1.1.2.gem deleted file mode 100644 index 9dac89ed..00000000 Binary files a/vendor/cache/fast_gettext-1.1.2.gem and /dev/null differ diff --git a/vendor/cache/fast_gettext-2.4.0.gem b/vendor/cache/fast_gettext-2.4.0.gem new file mode 100644 index 00000000..fdf8705b Binary files /dev/null and b/vendor/cache/fast_gettext-2.4.0.gem differ diff --git a/vendor/cache/forwardable-1.3.3.gem b/vendor/cache/forwardable-1.3.3.gem new file mode 100644 index 00000000..d2a96072 Binary files /dev/null and b/vendor/cache/forwardable-1.3.3.gem differ diff --git a/vendor/cache/hashdiff-0.3.7.gem b/vendor/cache/hashdiff-0.3.7.gem deleted file mode 100644 index ad89ce9f..00000000 Binary files a/vendor/cache/hashdiff-0.3.7.gem and /dev/null differ diff --git a/vendor/cache/hashdiff-1.1.0.gem b/vendor/cache/hashdiff-1.1.0.gem deleted file mode 100644 index 137674c1..00000000 Binary files a/vendor/cache/hashdiff-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/hashdiff-1.1.1.gem b/vendor/cache/hashdiff-1.1.1.gem new file mode 100644 index 00000000..f0a3f1b8 Binary files /dev/null and b/vendor/cache/hashdiff-1.1.1.gem differ diff --git a/vendor/cache/hiera-1.3.4.gem b/vendor/cache/hiera-1.3.4.gem deleted file mode 100644 index c7c1a527..00000000 Binary files a/vendor/cache/hiera-1.3.4.gem and /dev/null differ diff --git a/vendor/cache/hiera-3.4.5.gem b/vendor/cache/hiera-3.4.5.gem deleted file mode 100644 index adad7d82..00000000 Binary files a/vendor/cache/hiera-3.4.5.gem and /dev/null differ diff --git a/vendor/cache/hocon-1.3.1.gem b/vendor/cache/hocon-1.3.1.gem deleted file mode 100644 index e474ff66..00000000 Binary files a/vendor/cache/hocon-1.3.1.gem and /dev/null differ diff --git a/vendor/cache/hocon-1.4.0.gem b/vendor/cache/hocon-1.4.0.gem new file mode 100644 index 00000000..8a1e7162 Binary files /dev/null and b/vendor/cache/hocon-1.4.0.gem differ diff --git a/vendor/cache/httparty-0.16.2.gem b/vendor/cache/httparty-0.16.2.gem deleted file mode 100644 index aac518ed..00000000 Binary files a/vendor/cache/httparty-0.16.2.gem and /dev/null differ diff --git a/vendor/cache/httparty-0.16.3.gem b/vendor/cache/httparty-0.16.3.gem deleted file mode 100644 index b71d9c84..00000000 Binary files a/vendor/cache/httparty-0.16.3.gem and /dev/null differ diff --git a/vendor/cache/json-2.1.0.gem b/vendor/cache/json-2.1.0.gem deleted file mode 100644 index 23d69ffe..00000000 Binary files a/vendor/cache/json-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/json-2.7.1.gem b/vendor/cache/json-2.7.1.gem deleted file mode 100644 index 804bba30..00000000 Binary files a/vendor/cache/json-2.7.1.gem and /dev/null differ diff --git a/vendor/cache/json-2.7.2.gem b/vendor/cache/json-2.7.2.gem new file mode 100644 index 00000000..1c3c4680 Binary files /dev/null and b/vendor/cache/json-2.7.2.gem differ diff --git a/vendor/cache/json_pure-1.8.6.gem b/vendor/cache/json_pure-1.8.6.gem deleted file mode 100644 index 7380e49d..00000000 Binary files a/vendor/cache/json_pure-1.8.6.gem and /dev/null differ diff --git a/vendor/cache/locale-2.1.2.gem b/vendor/cache/locale-2.1.2.gem deleted file mode 100644 index 173d1034..00000000 Binary files a/vendor/cache/locale-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/locale-2.1.3.gem b/vendor/cache/locale-2.1.3.gem deleted file mode 100644 index a12851cd..00000000 Binary files a/vendor/cache/locale-2.1.3.gem and /dev/null differ diff --git a/vendor/cache/locale-2.1.4.gem b/vendor/cache/locale-2.1.4.gem new file mode 100644 index 00000000..60fd62df Binary files /dev/null and b/vendor/cache/locale-2.1.4.gem differ diff --git a/vendor/cache/mime-types-3.2.2.gem b/vendor/cache/mime-types-3.2.2.gem deleted file mode 100644 index 43fef77f..00000000 Binary files a/vendor/cache/mime-types-3.2.2.gem and /dev/null differ diff --git a/vendor/cache/mime-types-data-3.2018.0812.gem b/vendor/cache/mime-types-data-3.2018.0812.gem deleted file mode 100644 index 83ffe8b6..00000000 Binary files a/vendor/cache/mime-types-data-3.2018.0812.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.13.1.gem b/vendor/cache/multi_json-1.13.1.gem deleted file mode 100644 index 82e9f914..00000000 Binary files a/vendor/cache/multi_json-1.13.1.gem and /dev/null differ diff --git a/vendor/cache/parallel-1.12.1.gem b/vendor/cache/parallel-1.12.1.gem deleted file mode 100644 index 40fd54fb..00000000 Binary files a/vendor/cache/parallel-1.12.1.gem and /dev/null differ diff --git a/vendor/cache/parser-2.5.3.0.gem b/vendor/cache/parser-2.5.3.0.gem deleted file mode 100644 index 1ec0dc65..00000000 Binary files a/vendor/cache/parser-2.5.3.0.gem and /dev/null differ diff --git a/vendor/cache/powerpack-0.1.2.gem b/vendor/cache/powerpack-0.1.2.gem deleted file mode 100644 index 8fd924ea..00000000 Binary files a/vendor/cache/powerpack-0.1.2.gem and /dev/null differ diff --git a/vendor/cache/prime-0.1.2.gem b/vendor/cache/prime-0.1.2.gem new file mode 100644 index 00000000..45fa1cd2 Binary files /dev/null and b/vendor/cache/prime-0.1.2.gem differ diff --git a/vendor/cache/puppet-3.8.7.gem b/vendor/cache/puppet-3.8.7.gem deleted file mode 100644 index 6d276e2f..00000000 Binary files a/vendor/cache/puppet-3.8.7.gem and /dev/null differ diff --git a/vendor/cache/puppet-4.10.10-universal-darwin.gem b/vendor/cache/puppet-4.10.10-universal-darwin.gem deleted file mode 100644 index 21b2f33f..00000000 Binary files a/vendor/cache/puppet-4.10.10-universal-darwin.gem and /dev/null differ diff --git a/vendor/cache/puppet-4.10.10.gem b/vendor/cache/puppet-4.10.10.gem deleted file mode 100644 index a98710dc..00000000 Binary files a/vendor/cache/puppet-4.10.10.gem and /dev/null differ diff --git a/vendor/cache/puppet-5.5.22.gem b/vendor/cache/puppet-5.5.22.gem deleted file mode 100644 index 66fc27d9..00000000 Binary files a/vendor/cache/puppet-5.5.22.gem and /dev/null differ diff --git a/vendor/cache/puppet-5.5.8-universal-darwin.gem b/vendor/cache/puppet-5.5.8-universal-darwin.gem deleted file mode 100644 index 96a5a0f5..00000000 Binary files a/vendor/cache/puppet-5.5.8-universal-darwin.gem and /dev/null differ diff --git a/vendor/cache/puppet-5.5.8.gem b/vendor/cache/puppet-5.5.8.gem deleted file mode 100644 index 38cd7dc7..00000000 Binary files a/vendor/cache/puppet-5.5.8.gem and /dev/null differ diff --git a/vendor/cache/puppet-6.18.0.gem b/vendor/cache/puppet-6.18.0.gem deleted file mode 100644 index c3bcc148..00000000 Binary files a/vendor/cache/puppet-6.18.0.gem and /dev/null differ diff --git a/vendor/cache/puppet-7.3.0.gem b/vendor/cache/puppet-7.3.0.gem deleted file mode 100644 index 7c2705be..00000000 Binary files a/vendor/cache/puppet-7.3.0.gem and /dev/null differ diff --git a/vendor/cache/puppet-7.30.0.gem b/vendor/cache/puppet-7.30.0.gem new file mode 100644 index 00000000..a0852b3f Binary files /dev/null and b/vendor/cache/puppet-7.30.0.gem differ diff --git a/vendor/cache/puppet-resource_api-1.8.13.gem b/vendor/cache/puppet-resource_api-1.8.13.gem deleted file mode 100644 index 13f8c5ab..00000000 Binary files a/vendor/cache/puppet-resource_api-1.8.13.gem and /dev/null differ diff --git a/vendor/cache/puppet-resource_api-1.9.0.gem b/vendor/cache/puppet-resource_api-1.9.0.gem new file mode 100644 index 00000000..6ea7b150 Binary files /dev/null and b/vendor/cache/puppet-resource_api-1.9.0.gem differ diff --git a/vendor/cache/rake-12.3.1.gem b/vendor/cache/rake-12.3.1.gem deleted file mode 100644 index ea34ea6f..00000000 Binary files a/vendor/cache/rake-12.3.1.gem and /dev/null differ diff --git a/vendor/cache/rubocop-0.48.1.gem b/vendor/cache/rubocop-0.48.1.gem deleted file mode 100644 index 4c65eeb5..00000000 Binary files a/vendor/cache/rubocop-0.48.1.gem and /dev/null differ diff --git a/vendor/cache/ruby-progressbar-1.10.0.gem b/vendor/cache/ruby-progressbar-1.10.0.gem deleted file mode 100644 index 6a344a7e..00000000 Binary files a/vendor/cache/ruby-progressbar-1.10.0.gem and /dev/null differ diff --git a/vendor/cache/rugged-1.7.1.gem b/vendor/cache/rugged-1.7.1.gem deleted file mode 100644 index 67bd447b..00000000 Binary files a/vendor/cache/rugged-1.7.1.gem and /dev/null differ diff --git a/vendor/cache/rugged-1.7.2.gem b/vendor/cache/rugged-1.7.2.gem new file mode 100644 index 00000000..5e4af1b1 Binary files /dev/null and b/vendor/cache/rugged-1.7.2.gem differ diff --git a/vendor/cache/semantic_puppet-1.0.2.gem b/vendor/cache/semantic_puppet-1.0.2.gem deleted file mode 100644 index 305b4e61..00000000 Binary files a/vendor/cache/semantic_puppet-1.0.2.gem and /dev/null differ diff --git a/vendor/cache/semantic_puppet-1.0.4.gem b/vendor/cache/semantic_puppet-1.0.4.gem new file mode 100644 index 00000000..85050319 Binary files /dev/null and b/vendor/cache/semantic_puppet-1.0.4.gem differ diff --git a/vendor/cache/singleton-0.2.0.gem b/vendor/cache/singleton-0.2.0.gem new file mode 100644 index 00000000..a4e53ce7 Binary files /dev/null and b/vendor/cache/singleton-0.2.0.gem differ diff --git a/vendor/cache/thor-1.2.2.gem b/vendor/cache/thor-1.2.2.gem new file mode 100644 index 00000000..7b26ebed Binary files /dev/null and b/vendor/cache/thor-1.2.2.gem differ diff --git a/vendor/cache/unicode-display_width-1.4.0.gem b/vendor/cache/unicode-display_width-1.4.0.gem deleted file mode 100644 index ae62674c..00000000 Binary files a/vendor/cache/unicode-display_width-1.4.0.gem and /dev/null differ