diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 01922195..a509ab8c 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -41,17 +41,8 @@ jobs: - 'false' db: - postgresql - - mysql - sqlite3 exclude: - - db: mysql - ruby_version: '3.0' - - db: mysql - ruby_version: '3.2' - - db: mysql - ruby_version: '3.4' - - db: mysql - concurrent_ruby_ext: 'true' - db: sqlite3 ruby_version: '3.0' - db: sqlite3 @@ -76,13 +67,7 @@ jobs: ports: ['5432:5432'] options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 env: - POSTGRES_DB: travis_ci_test - mariadb: - image: mariadb:10 - ports: ['3306:3306'] - env: - MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' - MYSQL_DATABASE: travis_ci_test + POSTGRES_DB: ci_test redis: image: redis:latest ports: ['6379:6379'] diff --git a/Dockerfile b/Dockerfile index deed0c63..1c5027ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ ADD Gemfile /data/ ADD dynflow.gemspec /data/ ADD lib/dynflow/version.rb /data/lib/dynflow/version.rb WORKDIR /data -RUN bundle install --without mysql +RUN bundle install diff --git a/Gemfile b/Gemfile index b27109d5..68c43955 100644 --- a/Gemfile +++ b/Gemfile @@ -22,10 +22,6 @@ group :postgresql, optional: ENV.key?('CI') && ENV['DB'] != 'postgresql' do gem "pg" end -group :mysql, optional: ENV.key?('CI') && ENV['DB'] != 'mysql' do - gem "mysql2" -end - group :lint do gem 'theforeman-rubocop', '~> 0.0.4' end diff --git a/test/test_helper.rb b/test/test_helper.rb index 920d1056..904d749e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -118,10 +118,8 @@ def self.persistence_adapter @persistence_adapter ||= begin db_config = ENV.fetch('DB_CONN_STRING') do case ENV['DB'] - when 'mysql' - "mysql2://root@127.0.0.1/#{ENV.fetch('MYSQL_DATABASE', 'travis_ci_test')}" when 'postgresql' - "postgres://postgres@localhost/#{ENV.fetch('POSTGRES_DB', 'travis_ci_test')}" + "postgres://postgres@localhost/#{ENV.fetch('POSTGRES_DB', 'ci_test')}" else 'sqlite:/' end