Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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://[email protected]/#{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
Expand Down