Skip to content

Commit

Permalink
Add build for trilogy client
Browse files Browse the repository at this point in the history
In rails/rails#47880 we're adding Trilogy as an
additional mysql client for Rails. This change adds a new build for it.
  • Loading branch information
eileencodes committed Apr 7, 2023
1 parent 438d520 commit 6964ac1
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions pipeline-generate
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ def step_for(subdirectory, rake_task, ruby: nil, service: "default", pre_steps:

if rake_task.start_with?("mysql2:")
rake_task = "db:mysql:rebuild #{rake_task}"
if rake_task.start_with?("trilogy:")
rake_task = "db:trilogy:rebuild #{rake_task}"
elsif rake_task.start_with?("postgresql:")
rake_task = "db:postgresql:rebuild #{rake_task}"
end
Expand Down Expand Up @@ -228,6 +230,7 @@ end
actionview test default
activejob test default
activerecord mysql2:test mysqldb
activerecord trilogy:test mysqldb
activerecord postgresql:test postgresdb
activerecord sqlite3:test default
).each_slice(3) do |dir, task, service|
Expand Down Expand Up @@ -266,10 +269,20 @@ if RAILS_VERSION >= Gem::Version.new("6.1.x")
x["env"]["MYSQL_PREPARED_STATEMENTS"] = "true"
end
end
if RAILS_VERSION >= Gem::Version.new("7.1.x")
step_for("activerecord", "trilogy:test", service: "mysqldb") do |x|
x["label"] += " [prepared_statements_trilogy]"
x["env"]["MYSQL_PREPARED_STATEMENTS"] = "true"
end
end
step_for("activerecord", "mysql2:test", service: "mysqldb") do |x|
x["label"] += " [mysql_5_7]"
x["env"]["MYSQL_IMAGE"] = "mysql:5.7"
end
step_for("activerecord", "trilogy:test", service: "mysqldb") do |x|
x["label"] += " [mysql_5_7_trilogy]"
x["env"]["MYSQL_IMAGE"] = "mysql:5.7"
end
if RAILS_VERSION >= Gem::Version.new("5.x")
step_for("activerecord", "mysql2:test", service: "mysqldb") do |x|
x["label"] += " [mariadb]"
Expand All @@ -281,6 +294,12 @@ if RAILS_VERSION >= Gem::Version.new("5.x")
end
end
end
if RAILS_VERSION >= Gem::Version.new("7.1.x")
step_for("activerecord", "trilgy:test", service: "mysqldb") do |x|
x["label"] += " [mariadb_trilogy]"
x["env"]["MYSQL_IMAGE"] = "mariadb:latest"
end
end
steps_for("actioncable", "test:integration", service: "default") do |x|
if RAILS_VERSION < Gem::Version.new("6.x")
x["soft_fail"] = true
Expand Down

0 comments on commit 6964ac1

Please sign in to comment.