From b26e1da4a1755205d715a7e0e3989f58d5c426fe Mon Sep 17 00:00:00 2001 From: Stefan Wrobel Date: Sun, 3 Jun 2018 05:16:14 -0700 Subject: [PATCH] On CI, sort files & check modified w/ digest intead of mtime (#1522) --- lib/webpacker/compiler.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/webpacker/compiler.rb b/lib/webpacker/compiler.rb index 60df00c03..4db5b2394 100644 --- a/lib/webpacker/compiler.rb +++ b/lib/webpacker/compiler.rb @@ -45,7 +45,12 @@ def last_compilation_digest def watched_files_digest files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) } - Digest::SHA1.hexdigest(files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" }.join("/")) + file_ids = if ENV["CI"] + files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" } + else + files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" } + end + Digest::SHA1.hexdigest(file_ids.join("/")) end def record_compilation_digest