chore: reduce matrix for now

ClosureTree · Feb 11, 2024 · 49f3ff5 · 49f3ff5
1 parent 65d3aec
commit 49f3ff5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/ci-mysql5.yml b/.github/workflows/ci-mysql5.yml
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/ci-mysql8.yml b/.github/workflows/ci-mysql8.yml
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/ci-postgresql.yml b/.github/workflows/ci-postgresql.yml
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/ci-sqlite3.yml b/.github/workflows/ci-sqlite3.yml
@@ -1,4 +1,3 @@
----
 name: CI Sqlite3
 
 on:
@@ -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
@@ -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