Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve CI #33

Merged
merged 4 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
env:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
CI: true
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand All @@ -27,7 +26,6 @@ jobs:
env:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
CI: true
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/test-jruby.yml

This file was deleted.

17 changes: 9 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@ jobs:
env:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
CI: true
strategy:
fail-fast: false
matrix:
ruby: ["2.7", "3.0", "3.1", "3.2", ruby-head]
gemfile: [
"Gemfile"
]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", ruby-head, jruby]
rubocop_version: [""]
include:
- ruby: "2.6"
gemfile: "Gemfile"
- ruby: "3.1"
gemfile: "gemfiles/rubocopmaster.gemfile"
rubocop_version: "'1.0.0'"
- ruby: "3.2"
rubocop_version: "github: 'rubocop/rubocop'"
steps:
- uses: actions/checkout@v4
- name: Set up RuboCop version overwrite
if: ${{ matrix.rubocop_version != '' }}
run: |
echo "gem 'rubocop', ${{ matrix.rubocop_version }}" > Gemfile.local
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
# Specify your gem's dependencies in rubocop-md.gemspec
gemspec

local_gemfile = "Gemfile.local"
local_gemfile = "#{__dir__}/Gemfile.local"

if File.exist?(local_gemfile)
eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
Expand Down
5 changes: 0 additions & 5 deletions gemfiles/rubocopmaster.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion test/integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ class Person < ApplicationRecord
That's it.
CODE

res = run_rubocop(fixture_name, options: "--autocorrect-all")
res = run_rubocop(fixture_name, options: "-A")
assert_match %r{7 offenses detected}, res
assert_match %r{7 offenses corrected}, res

Expand Down