Merge pull request #146 from bastelfreak/dummy

CI: add dummy job to depend on
voxpupuli · Jul 7, 2023 · 0c76170 · 0c76170
2 parents 1089abd + 18529b3
commit 0c76170
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 33 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,41 +31,13 @@ jobs:
           - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
-          - "2.4"
         puppet:
           - "~> 7.0"
-          - "~> 6.29"
-          - "~> 5.5.10"
           - "https://github.com/puppetlabs/puppet.git#main"
         exclude:
-          - ruby: "2.6"
-            puppet: "~> 7.0"
-          - ruby: "2.5"
-            puppet: "~> 7.0"
-          - ruby: "2.4"
-            puppet: "~> 7.0"
-
-          - ruby: "3.1"
-            puppet: "~> 6.29"
-          - ruby: "3.0"
-            puppet: "~> 6.29"
-
-          - ruby: "3.1"
-            puppet: "~> 5.5.10"
           - ruby: "3.0"
-            puppet: "~> 5.5.10"
-          - ruby: "2.7"
-            puppet: "~> 5.5.10"
-          - ruby: "2.6"
-            puppet: "~> 5.5.10"
-
-          - ruby: "2.6"
             puppet: "https://github.com/puppetlabs/puppet.git#main"
-          - ruby: "2.5"
-            puppet: "https://github.com/puppetlabs/puppet.git#main"
-          - ruby: "2.4"
+          - ruby: "2.7"
             puppet: "https://github.com/puppetlabs/puppet.git#main"
     name: "Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }}"
     env:
@@ -79,3 +51,12 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rake
+
+  tests:
+    needs:
+      - rubocop
+      - test
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -8,7 +8,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.7'
   Exclude:
   - vendor/**/*
 

diff --git a/lib/puppet-syntax/templates.rb b/lib/puppet-syntax/templates.rb
@@ -73,7 +73,7 @@ def validate_erb(filename)
         erb = if RUBY_VERSION >= '2.6'
                 ERB.new(template, trim_mode: '-')
               else
-                ERB.new(template, nil, '-')
+                ERB.new(template, trim_mode: '-')
               end
         erb.filename = filename
         erb.result

diff --git a/puppet-syntax.gemspec b/puppet-syntax.gemspec
@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "rake"
-  spec.add_dependency "puppet", ">= 5"
+  spec.add_dependency "puppet", ">= 7"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rb-readline"