github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 23:07:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Fix broken conditional in docker:test Rake task (#23477)

Browse Source 
Broke in ef73d208323a43467fdd3367be0f413c965a398b
This commit is contained in:
Alan Guo Xiang Tan
2023-09-08 12:16:02 +08:00
committed by GitHub
parent 8ce5b82aa5
commit dc76d82f24
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/tasks/docker.rake
View File

@ -37,7 +37,7 @@ def setup_test_env(
create_parallel_db: false, create_parallel_db: false,
install_all_official: false, install_all_official: false,
update_all_plugins: false, update_all_plugins: false,
plugins_to_remove: [], plugins_to_remove: "",
load_plugins: false load_plugins: false
) )
ENV["RAILS_ENV"] = "test" ENV["RAILS_ENV"] = "test"
@ -51,7 +51,7 @@ def setup_test_env(
success &&= run_or_fail("bundle exec rake plugin:install_all_official") if install_all_official success &&= run_or_fail("bundle exec rake plugin:install_all_official") if install_all_official
success &&= run_or_fail("bundle exec rake plugin:update_all") if update_all_plugins success &&= run_or_fail("bundle exec rake plugin:update_all") if update_all_plugins
if plugins_to_remove.any? if !plugins_to_remove.blank?
plugins_to_remove plugins_to_remove
.split(",") .split(",")
.map(&:strip) .map(&:strip)
@ -200,12 +200,12 @@ task "docker:test" do
@good &&= @good &&=
setup_test_env( setup_test_env(
setup_multisite: ENV["JS_ONLY"] ? false : true, setup_multisite: !ENV["JS_ONLY"],
create_db: ENV["SKIP_DB_CREATE"] ? true : false, create_db: !ENV["SKIP_DB_CREATE"],
create_parallel_db: ENV["USE_TURBO"] ? true : false, create_parallel_db: !!ENV["USE_TURBO"],
install_all_official: ENV["INSTALL_OFFICIAL_PLUGINS"], install_all_official: !!ENV["INSTALL_OFFICIAL_PLUGINS"],
update_all_plugins: ENV["UPDATE_ALL_PLUGINS"], update_all_plugins: !!ENV["UPDATE_ALL_PLUGINS"],
plugins_to_remove: ENV["SKIP_INSTALL_PLUGINS"] || [], plugins_to_remove: ENV["SKIP_INSTALL_PLUGINS"] || "",
load_plugins: !ENV["SKIP_PLUGINS"], load_plugins: !ENV["SKIP_PLUGINS"],
) )