Skip to content

Commit 3ab0026

Browse files
seurosseuros
authored
chore: reduce matrix for now (#97)
1 parent 65d3aec commit 3ab0026

File tree

4 files changed

+38
-36
lines changed

4 files changed

+38
-36
lines changed

‎.github/workflows/ci-mysql5.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ concurrency:
1010
jobs:
1111
minitest:
1212
runs-on: ubuntu-latest
13-
name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
13+
name: CI Mysql 5.7 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
1414
services:
1515
mysql:
1616
image: mysql/mysql-server:5.7
1717
ports:
18-
- "3306:3306"
18+
- 3306
1919
env:
2020
MYSQL_USER: with_advisory
2121
MYSQL_PASSWORD: with_advisory_pass
@@ -25,23 +25,23 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
ruby:
28-
- '3.2'
29-
- '3.1'
30-
- '3.0'
31-
- '2.7'
28+
# - '3.2'
29+
# - '3.1'
30+
# - '3.0'
31+
# - '2.7'
3232
- '3.3'
3333
- 'truffleruby'
3434
rails:
3535
- 7.1
3636
- "7.0"
3737
- 6.1
3838
adapter:
39-
- mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test
40-
- trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test
39+
- mysql2
40+
- trilogy
4141
include:
4242
- ruby: jruby
4343
rails: 6.1
44-
adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
44+
adapter: jdbcmysql
4545
steps:
4646
- name: Checkout
4747
uses: actions/checkout@v4
@@ -56,6 +56,6 @@ jobs:
5656
- name: Test
5757
env:
5858
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
59-
DATABASE_URL: ${{ matrix.adapter }}
59+
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
6060
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
6161
run: bundle exec rake

‎.github/workflows/ci-mysql8.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ concurrency:
1111
jobs:
1212
minitest:
1313
runs-on: ubuntu-latest
14-
name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
14+
name: CI Mysql 8.0 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
1515
services:
1616
mysql:
1717
image: mysql/mysql-server
1818
ports:
19-
- "3306:3306"
19+
- 3306
2020
env:
2121
MYSQL_USER: with_advisory
2222
MYSQL_PASSWORD: with_advisory_pass
@@ -26,23 +26,23 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
ruby:
29-
- '3.2'
30-
- '3.1'
31-
- '3.0'
32-
- '2.7'
29+
# - '3.2'
30+
# - '3.1'
31+
# - '3.0'
32+
# - '2.7'
3333
- '3.3'
3434
- 'truffleruby'
3535
rails:
3636
- 7.1
3737
- "7.0"
3838
- 6.1
3939
adapter:
40-
- mysql2://with_advisory:with_advisory_pass@0/with_advisory_lock_test
40+
- mysql2
4141
# - trilogy://with_advisory:with_advisory_pass@0/with_advisory_lock_test Trilogy is not supported by mysql 8 with new encryption
4242
include:
4343
- ruby: jruby
4444
rails: 6.1
45-
adapter: jdbcmysql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
45+
adapter: jdbcmysql
4646
steps:
4747
- name: Checkout
4848
uses: actions/checkout@v4
@@ -57,6 +57,6 @@ jobs:
5757
- name: Test
5858
env:
5959
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
60-
DATABASE_URL: ${{ matrix.adapter }}
60+
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@0:${{ job.services.mysql.ports[3306] }}/with_advisory_lock_test
6161
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
6262
run: bundle exec rake

‎.github/workflows/ci-postgresql.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ concurrency:
1010
jobs:
1111
minitest:
1212
runs-on: ubuntu-latest
13+
name: CI Postgresql Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
1314
services:
1415
postgres:
15-
image: 'postgres:14-alpine'
16-
ports: ['5432:5432']
16+
image: 'postgres:16-alpine'
17+
ports:
18+
- '5432'
1719
env:
1820
POSTGRES_USER: with_advisory
1921
POSTGRES_PASSWORD: with_advisory_pass
@@ -27,22 +29,22 @@ jobs:
2729
fail-fast: false
2830
matrix:
2931
ruby:
30-
- '3.2'
31-
- '3.1'
32-
- '3.0'
33-
- '2.7'
32+
# - '3.2'
33+
# - '3.1'
34+
# - '3.0'
35+
# - '2.7'
3436
- '3.3'
3537
- 'truffleruby'
3638
rails:
3739
- 7.1
3840
- "7.0"
3941
- 6.1
4042
adapter:
41-
- postgres://with_advisory:with_advisory_pass@0/with_advisory_lock_test
43+
- postgres
4244
include:
4345
- ruby: jruby
4446
rails: 6.1
45-
adapter: jdbcpostgresql://with_advisory:with_advisory_pass@0/with_advisory_lock_test
47+
adapter: jdbcpostgresql
4648
steps:
4749
- name: Checkout
4850
uses: actions/checkout@v4
@@ -57,6 +59,6 @@ jobs:
5759
- name: Test
5860
env:
5961
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
60-
DATABASE_URL: ${{ matrix.adapter }}
62+
DATABASE_URL: ${{ matrix.adapter }}://with_advisory:with_advisory_pass@localhost:${{ job.services.postgres.ports[5432] }}/with_advisory_lock_test
6163
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
6264
run: bundle exec rake

‎.github/workflows/ci-sqlite3.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: CI Sqlite3
32

43
on:
@@ -13,26 +12,27 @@ concurrency:
1312
jobs:
1413
minitest:
1514
runs-on: ubuntu-latest
15+
name: CI Sqlite3 Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / Adapter ${{ matrix.adapter }}
1616
strategy:
1717
fail-fast: false
1818
matrix:
1919
ruby:
20-
- '3.2'
21-
- '3.1'
22-
- '3.0'
23-
- '2.7'
20+
# - '3.2'
21+
# - '3.1'
22+
# - '3.0'
23+
# - '2.7'
2424
- '3.3'
2525
- 'truffleruby'
2626
rails:
2727
- 7.1
2828
- "7.0"
2929
- 6.1
3030
adapter:
31-
- sqlite3:///tmp/test.sqlite3
31+
- sqlite3
3232
include:
3333
- ruby: jruby
3434
rails: 6.1
35-
adapter: jdbcsqlite3:///tmp/test.sqlite3
35+
adapter: jdbcsqlite3
3636
steps:
3737
- name: Checkout
3838
uses: actions/checkout@v4
@@ -49,6 +49,6 @@ jobs:
4949
- name: Test
5050
env:
5151
BUNDLE_GEMFILE: gemfiles/activerecord_${{ matrix.rails }}.gemfile
52-
DATABASE_URL: ${{ matrix.adapter }}
52+
DATABASE_URL: ${{ matrix.adapter }}:///tmp/test.sqlite3
5353
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
5454
run: bundle exec rake

0 commit comments

Comments
 (0)