Skip to content

Commit

Permalink
Update standard 1.37.0 β†’ 1.41.1 (minor) (#280)
Browse files Browse the repository at this point in the history
* Update standard 1.37.0 β†’ 1.41.1 (minor)
* remove unsupported ruby/rails versions
  • Loading branch information
joshuap authored Nov 6, 2024
1 parent c078140 commit 102fdd2
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 120 deletions.
52 changes: 15 additions & 37 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ name: Test

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:

runs-on: ubuntu-latest

services:
Expand All @@ -21,34 +20,13 @@ jobs:
fail-fast: false
matrix:
rails:
- rails_5.2
- rails_6.0
- rails_6.1
- rails_7.0
- rails_7.1
- rails_7.2
ruby:
- 3.3
- 3.2
- 3.1
- '3.0'
- 2.7
exclude:
- ruby: 3.2
rails: rails_5.2
- ruby: 3.2
rails: rails_6.0
- ruby: 3.2
rails: rails_6.1
- ruby: 3.1
rails: rails_5.2
- ruby: 3.1
rails: rails_6.0
- ruby: 3.0
rails: rails_5.2
- ruby: 3.0
rails: rails_7.2
- ruby: 2.7
rails: rails_7.2

env:
PGHOST: localhost
Expand All @@ -58,18 +36,18 @@ jobs:
BUNDLE_GEMFILE: "./gemfiles/${{ matrix.rails }}.gemfile"

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Install PostgreSQL 11 client
run: |
sudo apt-get -yqq install libpq-dev postgresql-client
- name: Install PostgreSQL 11 client
run: |
sudo apt-get -yqq install libpq-dev postgresql-client
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Build and test
run: |
bundle exec rake db:create db:schema:load test
- name: Build and test
run: |
bundle exec rake db:create db:schema:load test
14 changes: 1 addition & 13 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
appraise "rails-5.2" do
gem "rails", "~> 5.2.0"
end

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

appraise "rails-6.1" do
gem "rails", "~> 6.1.4"
end

appraise "rails-7.0" do
gem "rails", "~> 7.0.0"
end
Expand All @@ -20,4 +8,4 @@ end

appraise "rails-7.2" do
gem "rails", "~> 7.2.0"
end
end
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gemspec
# gem 'byebug', group: [:development, :test]

group :development, :test do
gem "standard", "~> 1.37.0"
gem "standard", "~> 1.41.0"
gem "yard", "~> 0.9.36"
end

Expand Down
16 changes: 7 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,14 @@ GEM
regexp_parser (2.9.2)
reline (0.5.10)
io-console (~> 0.5)
rexml (3.3.9)
rubocop (1.64.1)
rubocop (1.66.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.34.0)
Expand All @@ -216,12 +214,12 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
standard (1.37.0)
standard (1.41.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.64.0)
rubocop (~> 1.66.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.4)
standard-performance (~> 1.5)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
Expand Down Expand Up @@ -253,7 +251,7 @@ DEPENDENCIES
pry (~> 0.14.0)
pry-rails (~> 0.3.9)
simplecov
standard (~> 1.37.0)
standard (~> 1.41.0)
timecop (~> 0.9.2)
yard (~> 0.9.36)

Expand Down
17 changes: 0 additions & 17 deletions gemfiles/rails_5.2.gemfile

This file was deleted.

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

This file was deleted.

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

This file was deleted.

4 changes: 2 additions & 2 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ gem "pry-rails", "~> 0.3.9"
gem "rails", "~> 7.0.0"

group :development, :test do
gem "standard", "~> 1.37.0"
gem "yard", "~> 0.9.26"
gem "standard", "~> 1.41.0"
gem "yard", "~> 0.9.36"
end

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ gem "pry-rails", "~> 0.3.9"
gem "rails", "~> 7.1.0"

group :development, :test do
gem "standard", "~> 1.37.0"
gem "yard", "~> 0.9.26"
gem "standard", "~> 1.41.0"
gem "yard", "~> 0.9.36"
end

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ gem "pry-rails", "~> 0.3.9"
gem "rails", "~> 7.2.0"

group :development, :test do
gem "standard", "~> 1.37.0"
gem "yard", "~> 0.9.26"
gem "standard", "~> 1.41.0"
gem "yard", "~> 0.9.36"
end

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/heya/active_record_extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module ActiveRecordRelationExtension
TABLE_REGEXP = /heya_steps/

def build_arel(...) # forward all params. Handles differences between 7.1 -> 7.2
arel = super(...)
arel = super

if table_name == "heya_campaign_memberships" && arel.to_sql =~ TABLE_REGEXP
# https://www.postgresql.org/docs/9.4/queries-values.html
Expand Down
4 changes: 2 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ def teardown
Timecop.return
end

def create_test_campaign(name: "TestCampaign", parent: Heya::Campaigns::Base, action: NullAction, &block)
def create_test_campaign(name: "TestCampaign", parent: Heya::Campaigns::Base, action: NullAction, &)
klass = Class.new(parent) {
class << self
attr_accessor :name
end
}
klass.name = name
klass.default(action: action)
klass.instance_exec(&block)
klass.instance_exec(&)
Object.send(:remove_const, klass.name) if Object.const_defined?(klass.name.to_sym)
Object.send(:const_set, klass.name.to_sym, klass)
klass
Expand Down

0 comments on commit 102fdd2

Please sign in to comment.