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
6 changes: 6 additions & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,14 @@ jobs:
name: Bundle update adapters
run: |
for gemfile_path in gemfiles/*.gemfile; do
# Edge Gemfiles intentionally have no lockfile so CI resolves rails/main at run time.
case "${gemfile_path}" in
*_edge.gemfile) continue ;;
esac

BUNDLE_GEMFILE="${gemfile_path}" bundle update
done
rm -f gemfiles/*_edge.gemfile.lock
-
name: Create Pull Request
id: cpr
Expand Down
34 changes: 26 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
semian:
name: Ruby ${{ matrix.ruby }} / semian
name: Ruby ${{ matrix.ruby }} / semian / Rails ${{ matrix.rails_version }}
runs-on: ubuntu-latest
container:
image: ruby:${{ matrix.ruby }}
Expand All @@ -28,14 +28,21 @@ jobs:
options: --hostname http-server
env:
CI: "1"
BUNDLE_GEMFILE: Gemfile
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
strategy:
fail-fast: true
fail-fast: false
matrix:
ruby:
- "3.4"
- "3.3"
- "3.2"
gemfile:
- Gemfile
- gemfiles/rails_edge.gemfile
include:
- gemfile: Gemfile
rails_version: released
- gemfile: gemfiles/rails_edge.gemfile
rails_version: edge
services:
mysql:
image: mysql:9.3
Expand Down Expand Up @@ -74,9 +81,9 @@ jobs:
with:
path: vendor/bundle
# yamllint disable-line rule:line-length
key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}
key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-semian-${{ matrix.rails_version }}-gems-${{ hashFiles(env.BUNDLE_GEMFILE, format('{0}.lock', env.BUNDLE_GEMFILE)) }}
restore-keys: |
${{ runner.os }}-ruby-${{ matrix.ruby }}-gems-
${{ runner.os }}-ruby-${{ matrix.ruby }}-semian-${{ matrix.rails_version }}-gems-
-
name: Bundle
run: |
Expand Down Expand Up @@ -122,18 +129,21 @@ jobs:
ruby:
- "3.4"
- "3.3"
- "3.2"
gemfile:
- grpc
- mysql2
- net_http
- rails_mysql2
- rails_mysql2_edge
- rails_trilogy
- rails_trilogy_edge
- redis_4
- redis_5
- redis_client
- activerecord_trilogy_adapter
- activerecord_trilogy_adapter_edge
- activerecord_postgresql_adapter
- activerecord_postgresql_adapter_edge
include:
- gemfile: grpc
adapter: grpc
Expand All @@ -143,8 +153,12 @@ jobs:
adapter: net_http
- gemfile: rails_mysql2
adapter: rails_mysql2
- gemfile: rails_mysql2_edge
adapter: rails_mysql2
- gemfile: rails_trilogy
adapter: rails_trilogy
- gemfile: rails_trilogy_edge
adapter: rails_trilogy
- gemfile: redis_4
adapter: redis
- gemfile: redis_5
Expand All @@ -153,8 +167,12 @@ jobs:
adapter: redis_client
- gemfile: activerecord_trilogy_adapter
adapter: activerecord_trilogy_adapter
- gemfile: activerecord_trilogy_adapter_edge
adapter: activerecord_trilogy_adapter
- gemfile: activerecord_postgresql_adapter
adapter: activerecord_postgresql_adapter
- gemfile: activerecord_postgresql_adapter_edge
adapter: activerecord_postgresql_adapter
services:
mysql:
image: mysql:9.3
Expand Down Expand Up @@ -193,7 +211,7 @@ jobs:
with:
path: vendor/bundle
# yamllint disable-line rule:line-length
key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}
key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-${{ hashFiles(env.BUNDLE_GEMFILE, format('{0}.lock', env.BUNDLE_GEMFILE)) }}
restore-keys: |
${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-
-
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
.vscode/ipch
.vscode/launch.json
*.gem
gemfiles/*.gemfile.lock
*.swo
*.swp
/checksums/
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ group :test do
gem "benchmark-memory"
gem "benchmark-ips"
gem "memory_profiler"
gem "minitest"
gem "minitest", "5.26.2"
gem "mocha"
gem "pry-byebug", require: false
gem "toxiproxy"
Expand All @@ -22,7 +22,7 @@ group :test do
gem "mysql2", "~> 0.5"
gem "trilogy", "~> 2.9"
gem "pg", "~> 1.6"
gem "activerecord", github: "rails/rails", branch: "main"
gem "activerecord", "~> 8.1.0"
gem "hiredis", "~> 0.6"
# NOTE: v0.12.0 required for ruby 3.2.0. https://github.com/redis-rb/redis-client/issues/58
gem "hiredis-client", ">= 0.12.0"
Expand Down
52 changes: 23 additions & 29 deletions Gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gemfiles/activerecord_postgresql_adapter.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ gem "webrick"
gem "concurrent-ruby"

gem "pg", "~> 1.6"
gem "activerecord", github: "rails/rails"
gem "activerecord", "~> 8.1.0"

gemspec path: "../"
89 changes: 0 additions & 89 deletions gemfiles/activerecord_postgresql_adapter.gemfile.lock

This file was deleted.

16 changes: 16 additions & 0 deletions gemfiles/activerecord_postgresql_adapter_edge.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"
gem "rake-compiler"
gem "minitest"
gem "mocha"
gem "toxiproxy"
gem "webrick"
gem "concurrent-ruby"

gem "pg", "~> 1.6"
gem "activerecord", github: "rails/rails", branch: "main"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/activerecord_trilogy_adapter.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ gem "webrick"
gem "concurrent-ruby"

gem "trilogy", "~> 2.4"
gem "activerecord", github: "rails/rails"
gem "activerecord", "~> 8.1.0"

gemspec path: "../"
Loading
Loading