Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
jackjennings committed Aug 20, 2024
2 parents df81ba8 + c5e4937 commit 346001c
Show file tree
Hide file tree
Showing 62 changed files with 2,013 additions and 914 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
matrix:
os: [ "ubuntu-20.04" ]
ruby:
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
gemfile:
- gemfiles/rails_6.0.gemfile
- gemfiles/rails_6.1.gemfile
- gemfiles/rails_7.0.gemfile
- gemfiles/rails_7.1.gemfile
- gemfiles/rails_7.2.gemfile
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
Expand All @@ -32,4 +32,4 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rspec
run: bundle exec rspec
13 changes: 6 additions & 7 deletions .github/workflows/gempush.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Ruby Gem
name: Release Gem

on:
push:
branches:
- main
release:
types: [released]

jobs:
build:
Expand All @@ -12,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@master
- name: Set up Ruby 2.6
uses: actions/setup-ruby@v1
- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
with:
version: 2.6.x
ruby-version: '3.2'

- name: Publish to RubyGems
run: |
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/.rvmrc
*.gem
*.lock
gemfiles/.bundle
spec/db/test.db
spec/db/other_test.db
spec/db/data_schema.rb
.vscode/
.DS_Store
.ruby-gemset
.ruby-version
.idea/
vendor/
vendor/
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

17 changes: 9 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
appraise 'rails-5.2' do
gem 'rails', '~> 5.2.3'
appraise 'rails-6.1' do
gem 'rails', '~> 6.1.0'
end

appraise 'rails-6.0' do
gem 'rails', '~> 6.0.0'
appraise 'rails-7.0' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails-6.1' do
gem 'rails', '~> 6.1.0'
appraise 'rails-7.1' do
gem 'rails', '7.1.0'
end

appraise 'rails-7.0' do
gem 'rails', '~> 7.0'

appraise 'rails-7.2' do
gem 'rails', '7.2.0.beta1'
end
57 changes: 57 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,62 @@
# Changelog

# 11.0.0rc
- Remove Ruby 3.0 from build matrix
- Support Rails 7.2.0 https://github.com/ilyakatz/data-migrate/pull/312
- Update gemfile.lock builds

## 9.4.2
- Fix db:prepare:with_data task

## 9.4.1
- Add db:prepare task

## 9.4.0
- Reset model schema cache before each data migration https://github.com/ilyakatz/data-migrate/pull/307
- Run load_config rake task before db:migrate:with_data https://github.com/ilyakatz/data-migrate/pull/308

## 9.3.0
- Improve with_data Rake task for multiple database https://github.com/ilyakatz/data-migrate/pull/296

## 9.2.0
- Support Rails 7.1 https://github.com/ilyakatz/data-migrate/pull/278
- Build and test against 7.1.0.rc1 https://github.com/ilyakatz/data-migrate/pull/286

## 9.1.0

- Fix a bug that caused `schema_sha1` in `ar_internal_metadata` to be reset to the `data_schema.rb` file. (#272)
- Remove the need for empty data_schema files for non-primary databases. (#273)

## [YANKED] 10.0.3.rc

- Remove all travis references [leoarnold](https//:github.com/leoarnold)
- Changing to rc because of ongoing discussion how to properly handle multiple database environments

## [YANKED] 10.0.2

Change "rails" dependencies to "railties"

## [YANKED] 10.0.1

- Bug fix for Rails 6 config [chaunce](https//:github.com/chaunce)
- Railties bug fix by [opti](https://github.com/opti)

## [YANKED] 10.0.0

Releasing 10.0.0

!!! Breaking changes !!!

- This version introduces a breaking change which may lead to undesired
behavior in multi-database environments. See https://github.com/ilyakatz/data-migrate/issues/181

## [YANKED] 10.0.0.rc1

- Changes by [chaunce](https//:github.com/chaunce)
- Multiple databases support
- Refactor to clean things up
- Deprecate rails 5.2 support for real

## 9.0.0

Ruby 3.2 support [mehanoid](https://github.com/mehanoid)
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
source "http://rubygems.org"

gem 'sqlite3', "~> 1.4"
gemspec
188 changes: 188 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
PATH
remote: .
specs:
data_migrate (11.0.0.rc)
activerecord (>= 6.1)
railties (>= 6.1)

GEM
remote: http://rubygems.org/
specs:
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
timeout (>= 0.4.0)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
builder (3.2.4)
childprocess (5.0.0)
coderay (1.1.3)
concurrent-ruby (1.3.1)
connection_pool (2.4.1)
crass (1.0.6)
diff-lcs (1.5.1)
drb (2.2.1)
erubi (1.12.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
iniparse (1.5.0)
io-console (0.7.2)
irb (1.11.2)
rdoc
reline (>= 0.4.2)
json (2.7.1)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
method_source (1.0.0)
minitest (5.23.1)
mutex_m (0.2.0)
nokogiri (1.16.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
overcommit (0.63.0)
childprocess (>= 0.6.3, < 6)
iniparse (~> 1.4)
rexml (~> 3.2)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.2)
stringio
racc (1.8.0)
rack (3.0.11)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rb-readline (0.5.5)
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.0)
reline (0.4.3)
io-console (~> 0.5)
rexml (3.3.3)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.60.2)
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.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
sqlite3 (1.7.2-aarch64-linux)
sqlite3 (1.7.2-arm64-darwin)
sqlite3 (1.7.2-x86_64-linux)
stringio (3.1.0)
strscan (3.1.0)
thor (1.3.1)
timecop (0.9.8)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
zeitwerk (2.6.13)

PLATFORMS
aarch64-linux
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
appraisal
data_migrate!
overcommit
pry
rake
rb-readline
rspec
rspec-core
rubocop
sqlite3
timecop

BUNDLED WITH
2.4.17
10 changes: 0 additions & 10 deletions Gemfile.rails5.2

This file was deleted.

11 changes: 0 additions & 11 deletions Gemfile.rails6.1

This file was deleted.

Loading

0 comments on commit 346001c

Please sign in to comment.