From 9c43ee2d19daabae04e9204687799a8e9bfd3d4a Mon Sep 17 00:00:00 2001 From: Yoann Lecuyer Date: Sun, 31 Jul 2022 23:15:05 +0200 Subject: [PATCH 1/3] Better: Add CSS_BUILD env var to skip css:build --- lib/tasks/cssbundling/build.rake | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/tasks/cssbundling/build.rake b/lib/tasks/cssbundling/build.rake index 1e3a9b0..00a23d9 100644 --- a/lib/tasks/cssbundling/build.rake +++ b/lib/tasks/cssbundling/build.rake @@ -2,17 +2,21 @@ namespace :css do desc "Build your CSS bundle" task :build do unless system "yarn install && yarn build:css" - raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors" + raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors or use CSS_BUILD=false env variable" end end end -if Rake::Task.task_defined?("assets:precompile") - Rake::Task["assets:precompile"].enhance(["css:build"]) -end +skip_css_build = %w(no false n f).include?(ENV["CSS_BUILD"]) + +unless skip_css_build + if Rake::Task.task_defined?("assets:precompile") + Rake::Task["assets:precompile"].enhance(["css:build"]) + end -if Rake::Task.task_defined?("test:prepare") - Rake::Task["test:prepare"].enhance(["css:build"]) -elsif Rake::Task.task_defined?("db:test:prepare") - Rake::Task["db:test:prepare"].enhance(["css:build"]) + if Rake::Task.task_defined?("test:prepare") + Rake::Task["test:prepare"].enhance(["css:build"]) + elsif Rake::Task.task_defined?("db:test:prepare") + Rake::Task["db:test:prepare"].enhance(["css:build"]) + end end From 4e0daaccd8e192bc9e7f9a5e3d504a1013b52afa Mon Sep 17 00:00:00 2001 From: Yoann Lecuyer Date: Sun, 8 Jan 2023 19:28:10 +0100 Subject: [PATCH 2/3] Change for SKIP_CSS_BUILD --- lib/tasks/cssbundling/build.rake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/tasks/cssbundling/build.rake b/lib/tasks/cssbundling/build.rake index 00a23d9..e32895b 100644 --- a/lib/tasks/cssbundling/build.rake +++ b/lib/tasks/cssbundling/build.rake @@ -2,14 +2,12 @@ namespace :css do desc "Build your CSS bundle" task :build do unless system "yarn install && yarn build:css" - raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors or use CSS_BUILD=false env variable" + raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors or use SKIP_CSS_BUILD env variable" end end end -skip_css_build = %w(no false n f).include?(ENV["CSS_BUILD"]) - -unless skip_css_build +unless ENV['SKIP_CSS_BUILD'] if Rake::Task.task_defined?("assets:precompile") Rake::Task["assets:precompile"].enhance(["css:build"]) end From 93f0b80048b4a13f74436035ed8afb2d29d6e856 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 9 Jan 2023 12:54:13 +0100 Subject: [PATCH 3/3] Fix single quotes --- lib/tasks/cssbundling/build.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/cssbundling/build.rake b/lib/tasks/cssbundling/build.rake index e32895b..aedf328 100644 --- a/lib/tasks/cssbundling/build.rake +++ b/lib/tasks/cssbundling/build.rake @@ -7,7 +7,7 @@ namespace :css do end end -unless ENV['SKIP_CSS_BUILD'] +unless ENV["SKIP_CSS_BUILD"] if Rake::Task.task_defined?("assets:precompile") Rake::Task["assets:precompile"].enhance(["css:build"]) end