Skip to content

Update to latest rails and ruby #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
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
24 changes: 16 additions & 8 deletions .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
name: Ruby
name: RSpec Tests

on: [push, pull_request_target]
on:
push:
branches:
- main

jobs:
test:

rspec:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
ruby-version: ['3.4', '3.3', '3.2']

steps:
- uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
- uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby-version }}
# Using this SHA fixes https://github.com/ruby/setup-ruby/issues/595
uses: ruby/setup-ruby@086ffb1a2090c870a3f881cc91ea83aa4243d408 # v1.195.0
with:
ruby-version: '3.1'
ruby-version: ${{ matrix.ruby-version }}
- name: Install dependencies
run: bundle install
- name: Installing all gem versions via Appraisal
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
*.gem
*.rbc
.bundle
.byebug_history
.config
.yardoc
Gemfile.lock
Expand Down
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
AllCops:
TargetRubyVersion: 2.7

Metrics/ParameterLists:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.4.2
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 3.4.2
27 changes: 11 additions & 16 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
appraise "rails-5.0" do
gem "railties", "~>5.0.0"
end

appraise "rails-5.1" do
gem "railties", "~>5.1.0"
end

appraise "rails-5.2" do
gem "railties", "~>5.2.0"
appraise "rails-7.0" do
gem "railties", "~>7.0.8"
# Fixes "uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger"
# See https://github.com/rails/rails/issues/54260
gem 'concurrent-ruby', '1.3.4'
end

appraise "rails-6.0" do
gem "railties", "~>6.0.0"
appraise "rails-7.1" do
gem "railties", "~>7.1.5"
end

appraise "rails-6.1" do
gem "railties", "~>6.1.0"
appraise "rails-7.2" do
gem "railties", "~>7.2.2"
end

appraise "rails-7.0" do
gem "railties", "~>7.0.0"
appraise "rails-8.0" do
gem "railties", "~>8.0.2"
end

appraise "rails-8.0" do
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1
FROM ruby:3.4
WORKDIR /srv/cache_crispies/
COPY . /srv/cache_crispies/
RUN gem install bundler
Expand Down
16 changes: 10 additions & 6 deletions cache_crispies.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,24 @@ Gem::Specification.new do |spec|
spec.summary = 'Fast Rails serializer with built-in caching'
spec.homepage = 'https://github.com/codenoble/cache-crispies'
spec.licenses = ['MIT']
spec.metadata = { 'source_code_uri' => 'https://github.com/codenoble/cache-crispies' }

spec.files = Dir.glob('{lib,spec}/**/*') + ['.rspec']
spec.test_files = spec.files.grep(%r{^(spec)/})
spec.require_paths = ['lib']

spec.add_dependency 'railties', '>= 5.0.0', '< 9.0'
spec.required_ruby_version = '>= 3.1.0'

spec.add_dependency 'railties', '>= 7.0.0', '< 9.0'
spec.add_dependency 'oj', '~> 3.7'

spec.add_development_dependency 'activemodel', '>= 5.0.0', '< 9.0'
spec.add_development_dependency 'appraisal', '~> 2.2'
spec.add_development_dependency 'bundler', '~> 2.0'
spec.add_development_dependency 'byebug', '~> 11.0'
spec.add_development_dependency 'activemodel', '>= 7.0.0', '< 9.0'
spec.add_development_dependency 'base64', '~> 0.2'
spec.add_development_dependency 'mutex_m', '~> 0.3'
spec.add_development_dependency 'appraisal', '~> 2.5'
spec.add_development_dependency 'debug', '~> 1.10'
spec.add_development_dependency 'rspec', '~> 3.13.0'
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.6'
spec.add_development_dependency 'simplecov', '~> 0.22'
spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
end
7 changes: 0 additions & 7 deletions gemfiles/rails_5.2.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails_6.0.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails_6.1.gemfile

This file was deleted.

3 changes: 2 additions & 1 deletion gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "railties", "~>7.0.0"
gem "railties", "~>7.0.8"
gem "concurrent-ruby", "1.3.4"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile → gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "railties", "~>5.0.0"
gem "railties", "~>7.1.5"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile → gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "railties", "~>5.1.0"
gem "railties", "~>7.2.2"

gemspec path: "../"
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
)
end

require 'byebug'
require_relative '../lib/cache_crispies'

RSpec.configure do |config|
Expand Down
Loading