From 9476f598d3de1193ae354c05039befb6fa189300 Mon Sep 17 00:00:00 2001 From: Kate Higa Date: Wed, 25 Jan 2023 19:54:12 -0500 Subject: [PATCH 1/2] chore: bump development dependencies --- .rubocop.yml | 9 +--- Gemfile.lock | 93 +++++++++++++++++++++--------------------- erblint-github.gemspec | 10 ++--- 3 files changed, 52 insertions(+), 60 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9739f21..7edaeb1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,17 +1,10 @@ inherit_gem: rubocop-github: - - config/default_edge.yml - - config/rails_edge.yml + - config/default.yml AllCops: NewCops: enable SuggestExtensions: false -Rails/RefuteMethods: - Enabled: false - Style/Documentation: Enabled: false - -Rails/RakeEnvironment: - Enabled: false diff --git a/Gemfile.lock b/Gemfile.lock index f283c43..b04ebb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,105 +6,104 @@ PATH GEM remote: https://rubygems.org/ specs: - actionview (6.1.6) - activesupport (= 6.1.6) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.6) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties builder (3.2.4) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crass (1.0.6) - erb_lint (0.1.1) + erb_lint (0.3.1) activesupport - better_html (~> 1.0.7) - html_tokenizer + better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow rubocop smart_properties - erubi (1.10.0) - html_tokenizer (0.0.7) - i18n (1.10.0) + erubi (1.12.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - loofah (2.18.0) + json (2.6.3) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mini_portile2 (2.8.0) - minitest (5.15.0) - mocha (1.14.0) - nokogiri (1.13.6) + mini_portile2 (2.8.1) + minitest (5.17.0) + mocha (2.0.2) + ruby2_keywords (>= 0.0.5) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.0.0) ast (~> 2.4.1) - racc (1.6.0) - rack (2.2.3.1) + racc (1.6.2) + rack (3.0.4.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) + regexp_parser (2.6.2) rexml (3.2.5) - rubocop (1.30.0) + rubocop (1.44.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) - rubocop-github (0.17.0) - rubocop - rubocop-performance - rubocop-rails - rubocop-performance (1.14.2) + rubocop-github (0.20.0) + rubocop (>= 1.37) + rubocop-performance (>= 1.15) + rubocop-rails (>= 2.17) + rubocop-performance (1.15.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.17.4) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) smart_properties (1.17.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (2.1.0) - zeitwerk (2.5.4) + unicode-display_width (2.4.2) PLATFORMS ruby DEPENDENCIES - erb_lint (~> 0.1.1) + erb_lint (~> 0.3.0) erblint-github! - minitest (~> 5.15) - mocha (~> 1.14) + minitest (~> 5.17.0) + mocha (~> 2.0.2) rake (~> 13.0.6) - rubocop (= 1.30.0) - rubocop-github (~> 0.17.0) + rubocop (= 1.44.1) + rubocop-github (~> 0.20.0) BUNDLED WITH - 2.2.32 + 2.3.26 diff --git a/erblint-github.gemspec b/erblint-github.gemspec index 90531d8..4532e62 100644 --- a/erblint-github.gemspec +++ b/erblint-github.gemspec @@ -16,12 +16,12 @@ Gem::Specification.new do |s| s.email = ["opensource+erblint-github@github.com"] s.authors = ["GitHub Open Source"] - s.add_development_dependency "erb_lint", "~> 0.1.1" - s.add_development_dependency "minitest", "~> 5.15" - s.add_development_dependency "mocha", "~> 1.14" + s.add_development_dependency "erb_lint", "~> 0.3.0" + s.add_development_dependency "minitest", "~> 5.17.0" + s.add_development_dependency "mocha", "~> 2.0.2" s.add_development_dependency "rake", "~> 13.0.6" - s.add_development_dependency "rubocop", "= 1.30.0" - s.add_development_dependency "rubocop-github", "~> 0.17.0" + s.add_development_dependency "rubocop", "= 1.44.1" + s.add_development_dependency "rubocop-github", "~> 0.20.0" s.metadata["rubygems_mfa_required"] = "true" end From 92c4535d9e026dd584b0ec2c9a2e76cef1d06d67 Mon Sep 17 00:00:00 2001 From: Kate Higa Date: Wed, 25 Jan 2023 20:01:13 -0500 Subject: [PATCH 2/2] update workflow --- .github/workflows/ci.yml | 96 +++++++++++++++++----------------------- erblint-github.gemspec | 2 +- 2 files changed, 42 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b4b6ce..da478ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,70 +6,56 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 3.0.x - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }} - - name: Lint with Rubocop - run: | - gem install bundler:2.2.32 - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - bundle exec rubocop + - uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + bundler-cache: true + - name: Lint with Rubocop + run: | + bundle install + bundle exec rubocop test: strategy: fail-fast: false matrix: - ruby_version: ["2.6", "2.7", "3.0"] + ruby_version: ["2.7", "3.0"] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby_version }} - - name: Install dependencies - run: bundle install --jobs 4 --retry 3 - - name: Run tests - run: bundle exec rake + - uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby_version }} + bundler-cache: true + - name: Install dependencies + run: bundle install + - name: Run tests + run: bundle exec rake docs-coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 3.0.x - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }} - - name: Verify docs coverage - run: | - gem install bundler:2.2.32 - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - bundle exec rake docs:coverage + - uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + bundler-cache: true + - name: Verify docs coverage + run: | + bundle install + bundle exec rake docs:coverage tests-coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 3.0.x - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }} - - name: Verify all rules have test coverage - run: | - gem install bundler:2.2.32 - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - bundle exec rake tests:coverage + - uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + bundler-cache: true + - name: Verify all rules have test coverage + run: | + bundle install + bundle exec rake tests:coverage diff --git a/erblint-github.gemspec b/erblint-github.gemspec index 4532e62..347fe46 100644 --- a/erblint-github.gemspec +++ b/erblint-github.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.files = Dir["README.md", "LICENSE", "lib/**/*"] s.require_paths = ["lib"] - s.required_ruby_version = ">= 2.6.0" + s.required_ruby_version = ">= 2.7.0" s.email = ["opensource+erblint-github@github.com"] s.authors = ["GitHub Open Source"]