From f68065dbb784de8f6f054dd7ba1d252dce5c28de Mon Sep 17 00:00:00 2001 From: eileencodes Date: Fri, 7 Apr 2023 11:29:57 -0400 Subject: [PATCH] Add build for trilogy client In https://github.com/rails/rails/pull/47880 we're adding Trilogy as an additional mysql client for Rails. This change adds a new build for it. The build is scoped to Rails 7.1 and above since we will not support Trilogy for older versions of Rails. --- pipeline-generate | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pipeline-generate b/pipeline-generate index 65446368..622e4020 100755 --- a/pipeline-generate +++ b/pipeline-generate @@ -136,7 +136,7 @@ def step_for(subdirectory, rake_task, ruby: nil, service: "default", pre_steps: label << " (#{short_ruby(ruby)})" end - if rake_task.start_with?("mysql2:") + if rake_task.start_with?("mysql2:") || (RAILS_VERSION >= Gem::Version.new("7.1.x") && rake_task.start_with?("trilogy:")) rake_task = "db:mysql:rebuild #{rake_task}" elsif rake_task.start_with?("postgresql:") rake_task = "db:postgresql:rebuild #{rake_task}" @@ -228,9 +228,12 @@ 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| + next if RAILS_VERSION >= Gem::Version.new("7.1.x") && task == "trilogy:test" + steps_for(dir, task, service: service) next unless MAINLINE