Skip to content

Commit

Permalink
Merge pull request stefankroes#577 from petergoldstein/feature/update…
Browse files Browse the repository at this point in the history
…d_rails_7

Rebased stefankroes#564 with Ruby 3.1 support and updated CI
  • Loading branch information
kbrock authored Jun 9, 2022
2 parents 6a6d3e7 + 9a4a444 commit ae24dad
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/run_test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
--health-retries=3
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- ruby: 2.5
Expand All @@ -45,6 +46,8 @@ jobs:
activerecord: 61
- ruby: "3.0"
activerecord: 61
- ruby: 3.1
activerecord: 70
env:
# for the pg cli (psql, pg_isready) and possibly rails
PGHOST: 127.0.0.1 # container is mapping it locally
Expand Down
Empty file removed .travis.yml
Empty file.
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%w(5.2.6 6.0.3 6.1.3).each do |ar_version|
%w[5.2.6 6.0.3 6.1.3 7.0.0].each do |ar_version|
appraise "gemfile-#{ar_version.split('.').first(2).join}" do
gem "activerecord", "~> #{ar_version}"
gem 'activerecord', "~> #{ar_version}"
end
end
10 changes: 10 additions & 0 deletions gemfiles/gemfile_70.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source 'https://rubygems.org'

gem 'activerecord', '~> 7.0.0'
gem 'mysql2'
gem 'pg'
gem 'sqlite3'

gemspec path: '../'
2 changes: 1 addition & 1 deletion lib/ancestry/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Ancestry
VERSION = "4.1.0"
VERSION = '4.1.1'
end
6 changes: 5 additions & 1 deletion test/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ def self.setup
end

# Setup database connection
all_config = YAML.load_file(filename)
all_config = if YAML.respond_to?(:safe_load_file)
YAML.safe_load_file(filename, aliases: true)
else
YAML.load_file(filename)
end
config = all_config[db_type]
if config.blank?
$stderr.puts "","","ERROR: Could not find '#{db_type}' in #{filename}"
Expand Down

0 comments on commit ae24dad

Please sign in to comment.