github · jhongturney · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git 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
@@ -1 +1 @@
-2.1.0
+2.3.0
diff --git 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
@@ -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
@@ -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
diff --git a/vendor/cache/CFPropertyList-2.3.6.gem b/vendor/cache/CFPropertyList-2.3.6.gem
diff --git a/vendor/cache/ast-2.4.0.gem b/vendor/cache/ast-2.4.0.gem
diff --git a/vendor/cache/concurrent-ruby-1.1.7.gem b/vendor/cache/concurrent-ruby-1.1.7.gem
diff --git a/vendor/cache/concurrent-ruby-1.3.4.gem b/vendor/cache/concurrent-ruby-1.3.4.gem
diff --git a/vendor/cache/deep_merge-1.2.1.gem b/vendor/cache/deep_merge-1.2.1.gem
diff --git a/vendor/cache/deep_merge-1.2.2.gem b/vendor/cache/deep_merge-1.2.2.gem
diff --git a/vendor/cache/diff-lcs-1.3.gem b/vendor/cache/diff-lcs-1.3.gem
diff --git a/vendor/cache/diff-lcs-1.5.0.gem b/vendor/cache/diff-lcs-1.5.0.gem
diff --git a/vendor/cache/diff-lcs-1.5.1.gem b/vendor/cache/diff-lcs-1.5.1.gem
diff --git a/vendor/cache/diffy-3.2.1.gem b/vendor/cache/diffy-3.2.1.gem
diff --git a/vendor/cache/facter-2.5.1-universal-darwin.gem b/vendor/cache/facter-2.5.1-universal-darwin.gem
diff --git a/vendor/cache/facter-2.5.1.gem b/vendor/cache/facter-2.5.1.gem
diff --git a/vendor/cache/facter-2.5.7.gem b/vendor/cache/facter-2.5.7.gem
diff --git a/vendor/cache/facter-4.9.0.gem b/vendor/cache/facter-4.9.0.gem
diff --git a/vendor/cache/fast_gettext-1.1.2.gem b/vendor/cache/fast_gettext-1.1.2.gem
diff --git a/vendor/cache/fast_gettext-2.4.0.gem b/vendor/cache/fast_gettext-2.4.0.gem
diff --git a/vendor/cache/forwardable-1.3.3.gem b/vendor/cache/forwardable-1.3.3.gem
diff --git a/vendor/cache/hashdiff-0.3.7.gem b/vendor/cache/hashdiff-0.3.7.gem
diff --git a/vendor/cache/hashdiff-1.1.0.gem b/vendor/cache/hashdiff-1.1.0.gem
diff --git a/vendor/cache/hashdiff-1.1.1.gem b/vendor/cache/hashdiff-1.1.1.gem
diff --git a/vendor/cache/hiera-1.3.4.gem b/vendor/cache/hiera-1.3.4.gem
diff --git a/vendor/cache/hiera-3.4.5.gem b/vendor/cache/hiera-3.4.5.gem
diff --git a/vendor/cache/hocon-1.3.1.gem b/vendor/cache/hocon-1.3.1.gem
diff --git a/vendor/cache/hocon-1.4.0.gem b/vendor/cache/hocon-1.4.0.gem
diff --git a/vendor/cache/httparty-0.16.2.gem b/vendor/cache/httparty-0.16.2.gem
diff --git a/vendor/cache/httparty-0.16.3.gem b/vendor/cache/httparty-0.16.3.gem
diff --git a/vendor/cache/json-2.1.0.gem b/vendor/cache/json-2.1.0.gem
diff --git a/vendor/cache/json-2.7.1.gem b/vendor/cache/json-2.7.1.gem
diff --git a/vendor/cache/json-2.7.2.gem b/vendor/cache/json-2.7.2.gem
diff --git a/vendor/cache/json_pure-1.8.6.gem b/vendor/cache/json_pure-1.8.6.gem
diff --git a/vendor/cache/locale-2.1.2.gem b/vendor/cache/locale-2.1.2.gem
diff --git a/vendor/cache/locale-2.1.3.gem b/vendor/cache/locale-2.1.3.gem
diff --git a/vendor/cache/locale-2.1.4.gem b/vendor/cache/locale-2.1.4.gem
diff --git a/vendor/cache/mime-types-3.2.2.gem b/vendor/cache/mime-types-3.2.2.gem
diff --git a/vendor/cache/mime-types-data-3.2018.0812.gem b/vendor/cache/mime-types-data-3.2018.0812.gem
diff --git a/vendor/cache/multi_json-1.13.1.gem b/vendor/cache/multi_json-1.13.1.gem
diff --git a/vendor/cache/parallel-1.12.1.gem b/vendor/cache/parallel-1.12.1.gem
diff --git a/vendor/cache/parser-2.5.3.0.gem b/vendor/cache/parser-2.5.3.0.gem
diff --git a/vendor/cache/powerpack-0.1.2.gem b/vendor/cache/powerpack-0.1.2.gem
diff --git a/vendor/cache/prime-0.1.2.gem b/vendor/cache/prime-0.1.2.gem
diff --git a/vendor/cache/puppet-3.8.7.gem b/vendor/cache/puppet-3.8.7.gem
diff --git a/vendor/cache/puppet-4.10.10-universal-darwin.gem b/vendor/cache/puppet-4.10.10-universal-darwin.gem
diff --git a/vendor/cache/puppet-4.10.10.gem b/vendor/cache/puppet-4.10.10.gem
diff --git a/vendor/cache/puppet-5.5.22.gem b/vendor/cache/puppet-5.5.22.gem
diff --git a/vendor/cache/puppet-5.5.8-universal-darwin.gem b/vendor/cache/puppet-5.5.8-universal-darwin.gem
diff --git a/vendor/cache/puppet-5.5.8.gem b/vendor/cache/puppet-5.5.8.gem
diff --git a/vendor/cache/puppet-6.18.0.gem b/vendor/cache/puppet-6.18.0.gem
diff --git a/vendor/cache/puppet-7.3.0.gem b/vendor/cache/puppet-7.3.0.gem
diff --git a/vendor/cache/puppet-7.30.0.gem b/vendor/cache/puppet-7.30.0.gem
diff --git a/vendor/cache/puppet-resource_api-1.8.13.gem b/vendor/cache/puppet-resource_api-1.8.13.gem
diff --git a/vendor/cache/puppet-resource_api-1.9.0.gem b/vendor/cache/puppet-resource_api-1.9.0.gem
diff --git a/vendor/cache/rake-12.3.1.gem b/vendor/cache/rake-12.3.1.gem
diff --git a/vendor/cache/rubocop-0.48.1.gem b/vendor/cache/rubocop-0.48.1.gem
diff --git a/vendor/cache/ruby-progressbar-1.10.0.gem b/vendor/cache/ruby-progressbar-1.10.0.gem
diff --git a/vendor/cache/rugged-1.7.1.gem b/vendor/cache/rugged-1.7.1.gem
diff --git a/vendor/cache/rugged-1.7.2.gem b/vendor/cache/rugged-1.7.2.gem
diff --git a/vendor/cache/semantic_puppet-1.0.2.gem b/vendor/cache/semantic_puppet-1.0.2.gem
diff --git a/vendor/cache/semantic_puppet-1.0.4.gem b/vendor/cache/semantic_puppet-1.0.4.gem
diff --git a/vendor/cache/singleton-0.2.0.gem b/vendor/cache/singleton-0.2.0.gem
diff --git a/vendor/cache/thor-1.2.2.gem b/vendor/cache/thor-1.2.2.gem
diff --git a/vendor/cache/unicode-display_width-1.4.0.gem b/vendor/cache/unicode-display_width-1.4.0.gem