Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

Commit

Permalink
Update checks
Browse files Browse the repository at this point in the history
Recently, the checks action began failing because a newer version of
Bundler (2.5.0) removed support for Ruby 2.6 and 2.7. Because the checks
action runs on Ruby 2.7, the action started to fail.

This commit:
- Updates the Ruby version from 2.7 to 3.0.
- Unpins Rubocop from a three-year-old verison.
- Updates Rubocop's TargetRubyVersion from 2.4 to 2.7.
- Addresses minor style offenses found by the updated Rubocop.
  • Loading branch information
mhashizume committed Feb 8, 2024
1 parent 1d96056 commit fd11e59
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AllCops:
- '.git/**/*'
- 'bin/*'
- 'output/**/*'
TargetRubyVersion: 2.4
TargetRubyVersion: 2.6

Layout/LineLength:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion configs/components/puppet-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/platforms/solaris-10-i386.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/platforms/solaris-10-sparc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/platforms/solaris-11-sparc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit fd11e59

Please sign in to comment.