Skip to content

Commit

Permalink
Merge branch 'rubocop-workflow'
Browse files Browse the repository at this point in the history
  • Loading branch information
gbp committed Dec 18, 2024
2 parents 37416c2 + cf2dd2e commit 95fcf2c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
fail-fast: false
matrix:
include:
- { ruby: 2.6 }
- { ruby: 2.7 }

steps:
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ on: [pull_request]

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
BUNDLE_ONLY: rubocop
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 2.7

- run: |
gem install securerandom -v 0.3.2
gem install activesupport -v 7.1.5.1
- name: Run RuboCop linter
uses: reviewdog/action-rubocop@v1
uses: reviewdog/action-rubocop@v2
with:
github_token: ${{ secrets.github_token }}
reporter: github-pr-review
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AllCops:
- 'bin/rubocop'
NewCops: enable
SuggestExtensions: false
TargetRubyVersion: 2.6
TargetRubyVersion: 2.7

Metrics/BlockLength:
Exclude:
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
arm64-darwin
ruby
x82_64-darwin

DEPENDENCIES
icasework!
Expand Down
2 changes: 1 addition & 1 deletion icasework.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
'organisations of all sizes to do a better job of case management'
spec.homepage = 'https://github.com/mysociety/icasework-ruby/'
spec.license = 'MIT'
spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')

spec.metadata['allowed_push_host'] = 'https://rubygems.org'

Expand Down

0 comments on commit 95fcf2c

Please sign in to comment.