Skip to content
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
17 changes: 7 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,33 @@ on:
pull_request:
push:
branches:
- master
- main
- spec_live

jobs:
test-and-lint:
name: Test and lint
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- "2.7"
- "3.0"
- "3.1"
- "3.2"
- "3.3"
- "3.4"
- "jruby-9.4"
- "jruby-10.0"
steps:
- name: Checkout code
uses: zendesk/checkout@v2
uses: actions/checkout@v5
- name: Set up Ruby
uses: zendesk/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
- name: Test and Lint
run: |
bundle install
bundle exec rake
bundle exec rubocop
spec-live:
Expand All @@ -45,15 +44,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: zendesk/checkout@v2
uses: actions/checkout@v5
- name: Set up Ruby
uses: zendesk/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 3.1
- name: spec:live
run: |
bundle install
bundle exec rake clean_live set_ci_credentials spec:live ||
bundle exec rake clean_live &&
bundle exec rspec spec/live --only-failures
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
id-token: write
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ spec/fixtures/cassettes
spec/fixtures/credentials.yml
coverage/**
.yardoc/**
Gemfile.lock
.ruby-version
vendor/bundle/**
pkg/**
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--color
--order random
22 changes: 16 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1
DisplayCopNames: true
SuggestExtensions: false
NewCops: enable
Exclude:
- .git/**/*
- spec/core/middleware/response/sanitize_response_spec.rb
- vendor/**/*

# Prevents Ruby 3.1 incompatibility error. You can enable this cop when Ruby 2.7 support is dropped.
# See https://github.com/rubocop/rubocop/issues/10258
Layout/BlockAlignment:
Enabled: false

# Align ends correctly.
Layout/EndAlignment:
EnforcedStyleAlignWith: variable
Expand Down Expand Up @@ -46,3 +43,16 @@ Metrics:

Style/DoubleNegation:
Enabled: false

Style/OptionalBooleanParameter:
Enabled: false

Naming/PredicateMethod:
Enabled: false

Style/HashEachMethods:
Enabled: false

Style/RedundantFetchBlock:
Exclude:
- spec/core/lru_cache_spec.rb
Loading