From d867df5d32eb85fd4e0d4e4d2fa13196893273cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Tue, 24 Jun 2025 16:51:15 +0200 Subject: [PATCH 1/2] use the usual package output directory for build summary This simplifies things for windows where we are currently outputing the summary into the sources location instead of the usual output one. No change is expected on linux where the package_dir is a subdirectory of the project_root --- lib/omnibus/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/omnibus/project.rb b/lib/omnibus/project.rb index 1087b378b..b1eea70b2 100644 --- a/lib/omnibus/project.rb +++ b/lib/omnibus/project.rb @@ -1481,7 +1481,7 @@ def store_package_duration(packager, duration) end def write_build_summary - out_path = "#{Config.project_root}/pkg/build-summary.json" + out_path = "#{Config.package_dir}/build-summary.json" log.info(log_key) { "Writing build summary to #{out_path}" } File.open(out_path, "w") do |f| f.write(FFI_Yajl::Encoder.encode(build_summary.to_hash, pretty: true)) From 5d27e76d260dee196bb4948289aaecc19ecba1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Thu, 26 Jun 2025 11:21:06 +0200 Subject: [PATCH 2/2] don't hardcode version manifest path --- lib/omnibus/cli.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/omnibus/cli.rb b/lib/omnibus/cli.rb index 79a4d196c..0b4914ffb 100644 --- a/lib/omnibus/cli.rb +++ b/lib/omnibus/cli.rb @@ -90,8 +90,8 @@ def build(name) project.build if @options[:output_manifest] - FileUtils.mkdir_p("pkg") - File.open(::File.join("pkg", "version-manifest.json"), "w") do |f| + FileUtils.mkdir_p(Omnibus::Config.package_dir) + File.open(::File.join(Omnibus::Config.package_dir, "version-manifest.json"), "w") do |f| f.write(FFI_Yajl::Encoder.encode(project.built_manifest.to_hash)) end end