Merge 'upstream/master' v9.1.1

Author: cooperka

.env.example

@@ -0,0 +1,10 @@
+# Copy this file to .env and update with your database connection strings
+
+# PostgreSQL primary database
+DATABASE_URL_PG=postgresql://closure_tree:closure_tree_pass@127.0.0.1:5434/closure_tree_test
+
+# MySQL secondary database
+DATABASE_URL_MYSQL=mysql2://closure_tree:closure_tree_pass@127.0.0.1:3367/closure_tree_test
+
+# SQLite database (optional, in-memory by default)
+# DATABASE_URL_SQLITE3=sqlite3:closure_tree_test.db

.github/workflows/ci.yml

@@ -1,4 +1,3 @@
----
 name: CI
 
 on:
@@ -10,49 +9,48 @@ on:
       - master
 
 jobs:
-  rspec:
+  test:
     runs-on: ubuntu-latest
+    
     services:
-      mysql:
-        image: mysql/mysql-server
-        ports:
-          - "3306:3306"
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: closure_tree_test
-          MYSQL_ROOT_HOST: '%'
       postgres:
-        image: 'postgres'
-        ports: ['5432:5432']
+        image: postgres:17-alpine
+        ports:
+          - 5432:5432
         env:
+          POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: closure_tree_test
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+          
+      mysql:
+        image: mysql:8
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: closure_tree_test
+          MYSQL_ROOT_PASSWORD: root
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
 
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - '3.2'
-          - '3.1'
-          - '3.0'
-          - '2.7'
+          - '3.4'
         rails:
-          - activerecord_7.0
-          - activerecord_6.1
-          - activerecord_6.0
-        adapter:
-          - 'sqlite3:///:memory:'
-          - mysql2://root:root@0/closure_tree_test
-          - postgres://closure_tree:closure_tree@0/closure_tree_test
+          - '8.0'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -61,13 +59,25 @@ jobs:
           bundler-cache: true
           rubygems: latest
         env:
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          RAILS_VERSION: ${{ matrix.rails }}
+          BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile
+
+      - name: Setup databases
+        env:
           RAILS_ENV: test
+          DATABASE_URL_PG: postgres://postgres:postgres@127.0.0.1:5432/closure_tree_test
+          DATABASE_URL_MYSQL: mysql2://root:root@127.0.0.1:3306/closure_tree_test
+          DATABASE_URL_SQLITE3: 'sqlite3::memory:'
+        run: |
+          cd test/dummy
+          bundle exec rails db:setup_all
 
-      - name: RSpec
+      - name: Run tests
         env:
-          RAILS_VERSION: ${{ matrix.rails }}
-          DB_ADAPTER: ${{ matrix.adapter }}
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          RAILS_ENV: test
+          DATABASE_URL_PG: postgres://postgres:postgres@127.0.0.1:5432/closure_tree_test
+          DATABASE_URL_MYSQL: mysql2://root:root@127.0.0.1:3306/closure_tree_test
+          DATABASE_URL_SQLITE3: 'sqlite3::memory:'
           WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
-        run: bin/rake
+        run: |
+          bundle exec rake test

.github/workflows/ci_jruby.yml

@@ -0,0 +1,18 @@
+name: release-please
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4

.github/workflows/ci_truffleruby.yml

@@ -5,6 +5,7 @@ pkg/
 rdoc/
 doc/
 *.sqlite3.db
+*.sqlite3
 *.log
 tmp/
 .DS_Store
@@ -13,4 +14,5 @@ tmp/
 *.lock
 .ruby-*
 *.iml
+.env
 coverage/

.github/workflows/release.yml

@@ -0,0 +1 @@
+{".":"9.1.1"}

.gitignore

@@ -1 +1 @@
-ruby 3.0.5
+ruby 3.4.4