diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 968bca2..31355fc 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -13,8 +13,8 @@ jobs: strategy: matrix: cfg: - - {check: rubocop, os: ubuntu-latest, ruby: 2.7} - - {check: commits, os: ubuntu-latest, ruby: 2.7} + - {check: rubocop, os: ubuntu-latest, ruby: 3.0} + - {check: commits, os: ubuntu-latest, ruby: 3.0} runs-on: ${{ matrix.cfg.os }} steps: diff --git a/.rubocop.yml b/.rubocop.yml index 2c4ff6f..17e0cf8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ AllCops: - '.git/**/*' - 'bin/*' - 'output/**/*' - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.6 Layout/LineLength: Enabled: false diff --git a/Gemfile b/Gemfile index ac362aa..0f6448c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'json' gem 'octokit' gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.105') gem 'rake' -gem 'rubocop', '~> 1.5.2' +gem 'rubocop', '~> 1.5' gem 'vanagon', *location_for(ENV['VANAGON_LOCATION'] || '~> 0.24') eval_gemfile("#{__FILE__}.local") if File.exist?("#{__FILE__}.local") diff --git a/configs/components/puppet-runtime.rb b/configs/components/puppet-runtime.rb index 1fb36b8..0eb811b 100644 --- a/configs/components/puppet-runtime.rb +++ b/configs/components/puppet-runtime.rb @@ -20,7 +20,7 @@ # so cmd.exe was not working as expected. [ "gunzip -c #{tarball_name} | tar -k -C /cygdrive/c/ -xf -", - "chmod 755 #{settings[:bindir].sub(/C:/, '/cygdrive/c')}/*" + "chmod 755 #{settings[:bindir].sub('C:', '/cygdrive/c')}/*" ] elsif platform.is_macos? # We can't untar into '/' because of SIP on macOS; Just copy the contents diff --git a/configs/platforms/solaris-10-i386.rb b/configs/platforms/solaris-10-i386.rb index 694304a..ec2fdfe 100644 --- a/configs/platforms/solaris-10-i386.rb +++ b/configs/platforms/solaris-10-i386.rb @@ -18,7 +18,7 @@ # please see man -s 4 admin for details about this file: # http://www.opensolarisforum.org/man/man4/admin.html # -# The key thing we don\'t want to prompt for are conflicting files. +# The key thing we don't want to prompt for are conflicting files. # The other nocheck settings are mostly defensive to prevent prompts # We _do_ want to check for available free space and abort if there is # not enough @@ -32,7 +32,7 @@ # Do not bother checking package dependencies (We take care of this) idepend=nocheck rdepend=nocheck -# DO check for available free space and abort if there isn\'t enough +# DO check for available free space and abort if there isn't enough space=quit # Do not check for setuid files. setuid=nocheck diff --git a/configs/platforms/solaris-10-sparc.rb b/configs/platforms/solaris-10-sparc.rb index 712159e..e79193d 100644 --- a/configs/platforms/solaris-10-sparc.rb +++ b/configs/platforms/solaris-10-sparc.rb @@ -22,7 +22,7 @@ # please see man -s 4 admin for details about this file: # http://www.opensolarisforum.org/man/man4/admin.html # -# The key thing we don\'t want to prompt for are conflicting files. +# The key thing we don't want to prompt for are conflicting files. # The other nocheck settings are mostly defensive to prevent prompts # We _do_ want to check for available free space and abort if there is # not enough @@ -36,7 +36,7 @@ # Do not bother checking package dependencies (We take care of this) idepend=nocheck rdepend=nocheck -# DO check for available free space and abort if there isn\'t enough +# DO check for available free space and abort if there isn't enough space=quit # Do not check for setuid files. setuid=nocheck diff --git a/configs/platforms/solaris-11-sparc.rb b/configs/platforms/solaris-11-sparc.rb index a89f92d..3ae50d6 100644 --- a/configs/platforms/solaris-11-sparc.rb +++ b/configs/platforms/solaris-11-sparc.rb @@ -14,7 +14,7 @@ # please see man -s 4 admin for details about this file: # http://www.opensolarisforum.org/man/man4/admin.html # -# The key thing we don\'t want to prompt for are conflicting files. +# The key thing we don't want to prompt for are conflicting files. # The other nocheck settings are mostly defensive to prevent prompts # We _do_ want to check for available free space and abort if there is # not enough @@ -28,7 +28,7 @@ # Do not bother checking package dependencies (We take care of this) idepend=nocheck rdepend=nocheck -# DO check for available free space and abort if there isn\'t enough +# DO check for available free space and abort if there isn't enough space=quit # Do not check for setuid files. setuid=nocheck