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
47 changes: 20 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,37 @@ jobs:
test:
strategy:
matrix:
include:
- gemfile: 6.0.gemfile
ruby: 2.5

- gemfile: 6.0.gemfile
ruby: 2.6

- gemfile: 6.0.gemfile
ruby: 2.7

- gemfile: 6.0.gemfile
ruby: '3.0'

- gemfile: 6.1.gemfile
ruby: '3.0'

- gemfile: 7.0.gemfile
ruby: '3.0'

- gemfile: 7.0.gemfile
ruby: '3.1'

- gemfile: 7.0.gemfile
ruby: '3.2'

ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
rails: ["8.0", "7.2", "7.1", "6.1"]
exclude:
- rails: "6.1"
ruby: "3.4"

- rails: "7.2"
ruby: "2.7"
- rails: "7.2"
ruby: "3.0"

- rails: "8.0"
ruby: "2.7"
- rails: "8.0"
ruby: "3.0"
- rails: "8.0"
ruby: "3.1"
runs-on: ubuntu-latest

services:
redis:
image: redis
ports: ['6379:6379']
ports: ["6379:6379"]
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

env:
RAILS_VERSION: ${{ matrix.rails }}
steps:
- uses: actions/checkout@v4

Expand All @@ -52,7 +46,6 @@ jobs:

- name: Install dependencies
run: |
bundle config set gemfile "${GITHUB_WORKSPACE}/gemfiles/${{ matrix.gemfile }}"
bundle install --jobs 4 --retry 3

- name: Display Ruby version
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ gemspec

gem "rubocop", require: false
gem "codeclimate-test-reporter"
gem "rack", "< 3"
gem "concurrent-ruby", "< 1.3.5"

gem "rails", "~> #{ENV.fetch('RAILS_VERSION', '8.0')}"
8 changes: 0 additions & 8 deletions gemfiles/6.0.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/6.1.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/7.0.gemfile

This file was deleted.

3 changes: 2 additions & 1 deletion lib/split/dashboard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class Dashboard < Sinatra::Base
if Object.const_defined?("Rails") && Rails.respond_to?(:env)
@current_env = Rails.env.titlecase
else
@current_env = "Rack: #{Rack.version}"
rack_version = Rack.respond_to?(:version) ? Rack.version : Rack.release
@current_env = "Rack: #{rack_version}"
end
erb :index
end
Expand Down
5 changes: 3 additions & 2 deletions lib/split/persistence/cookie_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ def default_options
end

def set_cookie_via_rack(key, value)
delete_cookie_header!(@response.header, key, value)
Rack::Utils.set_cookie_header!(@response.header, key, value)
headers = @response.respond_to?(:header) ? @response.header : @response.headers
delete_cookie_header!(headers, key, value)
Rack::Utils.set_cookie_header!(headers, key, value)
end

# Use Rack::Utils#make_delete_cookie_header after Rack 2.0.0
Expand Down
1 change: 1 addition & 0 deletions split.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Gem::Specification.new do |s|
s.add_dependency "sinatra", ">= 1.2.6"
s.add_dependency "rubystats", ">= 0.3.0"
s.add_dependency "matrix"
s.add_dependency "bigdecimal"

s.add_development_dependency "bundler", ">= 1.17"
s.add_development_dependency "simplecov", "~> 0.15"
Expand Down