diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7704685..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 @@ -74,7 +75,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..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 @@ -63,7 +64,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..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 @@ -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 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]