Merge branch 'master' into better-integration-tests

.github/workflows/lint.yml

@@ -12,7 +12,6 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
-      CI: true
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -27,7 +26,6 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
-      CI: true
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1

.github/workflows/test.yml

@@ -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 }}

Gemfile

@@ -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

README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop-md.svg)](http://badge.fury.io/rb/rubocop-md)
-![Test](https://github.com/rubocop-hq/rubocop-md/workflows/Test/badge.svg)
+![Test](https://github.com/rubocop/rubocop-md/workflows/Test/badge.svg)
 
 # Rubocop Markdown
 
@@ -158,7 +158,7 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/rubocop-hq/rubocop-md.
+Bug reports and pull requests are welcome on GitHub at https://github.com/rubocop/rubocop-md.
 
 ## License
 

rubocop-md.gemspec

@@ -10,17 +10,17 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Run Rubocop against your Markdown files to make sure that code examples follow style guidelines.}
   spec.description   = %q{Run Rubocop against your Markdown files to make sure that code examples follow style guidelines.}
-  spec.homepage      = "https://github.com/rubocop-hq/rubocop-md"
+  spec.homepage      = "https://github.com/rubocop/rubocop-md"
   spec.license       = "MIT"
 
   spec.files = Dir.glob("lib/**/*") + Dir.glob("config/**/*") + %w[README.md LICENSE.txt CHANGELOG.md]
 
   spec.metadata = {
-    "bug_tracker_uri" => "http://github.com/rubocop-hq/rubocop-md/issues",
-    "changelog_uri" => "https://github.com/rubocop-hq/rubocop-md/blob/master/CHANGELOG.md",
-    "documentation_uri" => "https://github.com/rubocop-hq/rubocop-md/blob/master/README.md",
-    "homepage_uri" => "https://github.com/rubocop-hq/rubocop-md",
-    "source_code_uri" => "http://github.com/rubocop-hq/rubocop-md"
+    "bug_tracker_uri" => "http://github.com/rubocop/rubocop-md/issues",
+    "changelog_uri" => "https://github.com/rubocop/rubocop-md/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/rubocop/rubocop-md/blob/master/README.md",
+    "homepage_uri" => "https://github.com/rubocop/rubocop-md",
+    "source_code_uri" => "http://github.com/rubocop/rubocop-md"
   }
 
   spec.required_ruby_version = ">= 2.6.0"