Skip to content
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

chore: reduce matrix for now #97

Merged
merged 1 commit into from
Feb 11, 2024
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
20 changes: 10 additions & 10 deletions .github/workflows/ci-mysql5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ concurrency:
jobs:
minitest:
runs-on: ubuntu-latest
name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
name: CI Mysql 5.7 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
services:
mysql:
image: mysql/mysql-server:5.7
ports:
- "3306:3306"
- 3306
env:
MYSQL_USER: with_advisory
MYSQL_PASSWORD: with_advisory_pass
Expand All @@ -25,23 +25,23 @@ jobs:
fail-fast: false
matrix:
ruby:
- '3.2'
- '3.1'
- '3.0'
- '2.7'
# - '3.2'
# - '3.1'
# - '3.0'
# - '2.7'
- '3.3'
- 'truffleruby'
rails:
- 7.1
- "7.0"
- 6.1
adapter:
- mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test
- trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test
- mysql2
- trilogy
include:
- ruby: jruby
rails: 6.1
adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
adapter: jdbcmysql
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -56,6 +56,6 @@ jobs:
- name: Test
env:
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
DATABASE_URL: ${{ matrix.adapter }}
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bundle exec rake
18 changes: 9 additions & 9 deletions .github/workflows/ci-mysql8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ concurrency:
jobs:
minitest:
runs-on: ubuntu-latest
name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
name: CI Mysql 8.0 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
services:
mysql:
image: mysql/mysql-server
ports:
- "3306:3306"
- 3306
env:
MYSQL_USER: with_advisory
MYSQL_PASSWORD: with_advisory_pass
Expand All @@ -26,23 +26,23 @@ jobs:
fail-fast: false
matrix:
ruby:
- '3.2'
- '3.1'
- '3.0'
- '2.7'
# - '3.2'
# - '3.1'
# - '3.0'
# - '2.7'
- '3.3'
- 'truffleruby'
rails:
- 7.1
- "7.0"
- 6.1
adapter:
- mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test
- mysql2
# - trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test Trilogy is not supported by mysql 8 with new encryption
include:
- ruby: jruby
rails: 6.1
adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
adapter: jdbcmysql
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -57,6 +57,6 @@ jobs:
- name: Test
env:
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
DATABASE_URL: ${{ matrix.adapter }}
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bundle exec rake
20 changes: 11 additions & 9 deletions .github/workflows/ci-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ concurrency:
jobs:
minitest:
runs-on: ubuntu-latest
name: CI Postgresql Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
services:
postgres:
image: 'postgres:14-alpine'
ports: ['5432:5432']
image: 'postgres:16-alpine'
ports:
- '5432'
env:
POSTGRES_USER: with_advisory
POSTGRES_PASSWORD: with_advisory_pass
Expand All @@ -27,22 +29,22 @@ jobs:
fail-fast: false
matrix:
ruby:
- '3.2'
- '3.1'
- '3.0'
- '2.7'
# - '3.2'
# - '3.1'
# - '3.0'
# - '2.7'
- '3.3'
- 'truffleruby'
rails:
- 7.1
- "7.0"
- 6.1
adapter:
- postgres://with_advisory:with_advisory_pass@0/with_advisory_lock_test
- postgres
include:
- ruby: jruby
rails: 6.1
adapter: jdbcpostgresql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
adapter: jdbcpostgresql
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -57,6 +59,6 @@ jobs:
- name: Test
env:
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
DATABASE_URL: ${{ matrix.adapter }}
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bundle exec rake
16 changes: 8 additions & 8 deletions .github/workflows/ci-sqlite3.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: CI Sqlite3

on:
Expand All @@ -13,26 +12,27 @@ concurrency:
jobs:
minitest:
runs-on: ubuntu-latest
name: CI Sqlite3 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
strategy:
fail-fast: false
matrix:
ruby:
- '3.2'
- '3.1'
- '3.0'
- '2.7'
# - '3.2'
# - '3.1'
# - '3.0'
# - '2.7'
- '3.3'
- 'truffleruby'
rails:
- 7.1
- "7.0"
- 6.1
adapter:
- sqlite3:///tmp/test.sqlite3
- sqlite3
include:
- ruby: jruby
rails: 6.1
adapter: jdbcsqlite3:///tmp/test.sqlite3
adapter: jdbcsqlite3
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -49,6 +49,6 @@ jobs:
- name: Test
env:
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
DATABASE_URL: ${{ matrix.adapter }}
DATABASE_URL: ${{ matrix.adapter }}:///tmp/test.sqlite3
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bundle exec rake