From 08bef705a2fbbbe3ef910873b955bb1ae879fc90 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 24 Jan 2024 18:56:58 +0100
Subject: [PATCH 1/2] fix: test adapter previously only sqlite3 was being
tested in CI due to a configuration error.
---
.github/workflows/ci.yml | 2 +-
.github/workflows/ci_jruby.yml | 2 +-
.github/workflows/ci_truffleruby.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7704685..6d6a8eb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
- name: RSpec
env:
RAILS_VERSION: ${{ matrix.rails }}
- DB_ADAPTER: ${{ matrix.adapter }}
+ DATABASE_URL: ${{ matrix.adapter }}
BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bin/rake
diff --git a/.github/workflows/ci_jruby.yml b/.github/workflows/ci_jruby.yml
index c7d0156..a8def78 100644
--- a/.github/workflows/ci_jruby.yml
+++ b/.github/workflows/ci_jruby.yml
@@ -63,7 +63,7 @@ jobs:
- name: RSpec
env:
RAILS_VERSION: ${{ matrix.rails }}
- DB_ADAPTER: ${{ matrix.adapter }}
+ DATABASE_URL: ${{ matrix.adapter }}
BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bin/rake
diff --git a/.github/workflows/ci_truffleruby.yml b/.github/workflows/ci_truffleruby.yml
index b61630f..db32001 100644
--- a/.github/workflows/ci_truffleruby.yml
+++ b/.github/workflows/ci_truffleruby.yml
@@ -66,7 +66,7 @@ jobs:
- name: RSpec
env:
RAILS_VERSION: ${{ matrix.rails }}
- DB_ADAPTER: ${{ matrix.adapter }}
+ DATABASE_URL: ${{ matrix.adapter }}
BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
run: bin/rake
From e01f3ecb8f2051cd1fd05074d41ded6782c2a2aa Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 24 Jan 2024 19:06:00 +0100
Subject: [PATCH 2/2] fix: database url
---
.github/workflows/ci.yml | 7 ++++---
.github/workflows/ci_jruby.yml | 7 ++++---
.github/workflows/ci_truffleruby.yml | 8 ++++----
Gemfile | 6 ------
Rakefile | 14 +-------------
5 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d6a8eb..fc3192a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,7 @@ jobs:
ports: ['5432:5432']
env:
POSTGRES_PASSWORD: postgres
+ POSTGRES_USER: closure_tree
POSTGRES_DB: closure_tree_test
options: >-
--health-cmd pg_isready
@@ -50,9 +51,9 @@ jobs:
- activerecord_6.1
- activerecord_edge
adapter:
- - 'sqlite3:///:memory:'
- - mysql2://root:root@0/closure_tree_test
- - postgres://closure_tree:closure_tree@0/closure_tree_test
+ - 'sqlite3:///tmp/closure_tree_test.sqlite3'
+ - mysql2://root:root@127.0.0.1:3306/closure_tree_test
+ - postgres://closure_tree:closure_tree@localhost:5432/closure_tree_test
exclude:
- ruby: '3.0'
rails: activerecord_edge
diff --git a/.github/workflows/ci_jruby.yml b/.github/workflows/ci_jruby.yml
index a8def78..a9afc83 100644
--- a/.github/workflows/ci_jruby.yml
+++ b/.github/workflows/ci_jruby.yml
@@ -29,6 +29,7 @@ jobs:
ports: ['5432:5432']
env:
POSTGRES_PASSWORD: postgres
+ POSTGRES_USER: closure_tree
POSTGRES_DB: closure_tree_test
options: >-
--health-cmd pg_isready
@@ -43,9 +44,9 @@ jobs:
- activerecord_7.0
- activerecord_6.1
adapter:
- - 'sqlite3:///:memory:'
- - mysql2://root:root@0/closure_tree_test
- - postgres://closure_tree:closure_tree@0/closure_tree_test
+ - 'sqlite3:///tmp/closure_tree_test.sqlite3'
+ - mysql2://root:root@127.0.0.1:3306/closure_tree_test
+ - postgres://closure_tree:closure_tree@localhost:5432/closure_tree_test
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/.github/workflows/ci_truffleruby.yml b/.github/workflows/ci_truffleruby.yml
index db32001..e835897 100644
--- a/.github/workflows/ci_truffleruby.yml
+++ b/.github/workflows/ci_truffleruby.yml
@@ -29,6 +29,7 @@ jobs:
ports: ['5432:5432']
env:
POSTGRES_PASSWORD: postgres
+ POSTGRES_USER: closure_tree
POSTGRES_DB: closure_tree_test
options: >-
--health-cmd pg_isready
@@ -45,10 +46,9 @@ jobs:
- activerecord_7.0
- activerecord_6.1
adapter:
- - 'sqlite3:///:memory:'
- - mysql2://root:root@0/closure_tree_test
- - postgres://closure_tree:closure_tree@0/closure_tree_test
-
+ - 'sqlite3:///tmp/closure_tree_test.sqlite3'
+ - mysql2://root:root@127.0.0.1:3306/closure_tree_test
+ - postgres://closure_tree:closure_tree@localhost:5432/closure_tree_test
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/Gemfile b/Gemfile
index 4c07fb6..61f1b84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,3 @@ source 'https://rubygems.org'
gemspec
-platform :mri do
- group :development do
- gem 'bump', '~> 0.10.0'
- gem 'github_changelog_generator', '~> 1.16'
- end
-end
diff --git a/Rakefile b/Rakefile
index e93b025..09df4e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,8 +8,6 @@ RSpec::Core::RakeTask.new(:spec) do |task|
task.pattern = 'spec/closure_tree/*_spec.rb'
end
-task default: %i[spec test]
-
namespace :spec do
desc 'Run all spec variants'
task :all do
@@ -29,14 +27,4 @@ Rake::TestTask.new do |t|
t.verbose = true
end
-if RUBY_ENGINE == 'ruby'
- require 'github_changelog_generator/task'
- GitHubChangelogGenerator::RakeTask.new :changelog do |config|
- config.user = 'ClosureTree'
- config.project = 'closure_tree'
- config.issues = false
- config.future_release = '5.2.0'
- config.since_tag = 'v7.4.0'
- end
-end
-task default: 'spec:all'
+task default: %i[spec:all test]