diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c7ac94f..50e994e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,16 +18,14 @@ jobs: fail-fast: false matrix: include: - - label: Ruby 2.5 - ruby_version: "2.5" - label: Ruby 2.7 ruby_version: "2.7" - label: Ruby 3.0 ruby_version: "3.0" - label: Ruby 3.1 ruby_version: "3.1" - - label: JRuby 9.2.20.1 - ruby_version: "jruby-9.2.20.1" + - label: JRuby 9.3.4.0 + ruby_version: "jruby-9.3.4.0" steps: - name: Checkout Repository uses: actions/checkout@v2 @@ -53,11 +51,11 @@ jobs: - job_name: "Profile Docs Site" step_name: "Build and Profile docs site" script_file: "profile-docs" - ruby_version: "2.5" + ruby_version: "2.7" - job_name: "Style Check" step_name: "Run RuboCop" script_file: "fmt" - ruby_version: "2.5" + ruby_version: "2.7" steps: - name: Checkout Repository uses: actions/checkout@v2 diff --git a/.rubocop.yml b/.rubocop.yml index 03324d13..ffdaffa3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,7 +13,7 @@ Jekyll/NoPutsAllowed: - rake/*.rake AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Include: - lib/**/*.rb - test/**/*.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 04c51c67..f7477b86 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,11 +1,17 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude` -# on 2021-10-06 12:22:03 UTC using RuboCop version 1.22.1. +# on 2022-04-06 10:48:47 UTC using RuboCop version 1.26.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 1 +# This cop supports safe auto-correction (--auto-correct). +Performance/BindCall: + Exclude: + - 'test/helper.rb' + # Offense count: 1 Style/CombinableLoops: Exclude: @@ -17,12 +23,3 @@ Style/CombinableLoops: Style/OptionalBooleanParameter: Exclude: - 'lib/jekyll/log_adapter.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiterals: - Exclude: - - 'lib/jekyll/filters.rb' - - 'lib/jekyll/utils.rb' diff --git a/appveyor.yml b/appveyor.yml index db721048..af31dd5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,8 +19,6 @@ environment: - RUBY_FOLDER_VER: "26" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "test" - - RUBY_FOLDER_VER: "26" - TEST_SUITE: "test" - RUBY_FOLDER_VER: "26" TEST_SUITE: "default-site" - RUBY_FOLDER_VER: "26" @@ -33,8 +31,6 @@ environment: - RUBY_FOLDER_VER: "26" TZINFO_VERSION: "~> 2.0" TEST_SUITE: "cucumber" - - RUBY_FOLDER_VER: "26" - TEST_SUITE: "cucumber" install: - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%