From 501080af85cf5db77c3b421a227521c46be8b5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Thu, 19 Jun 2025 08:47:45 -1000 Subject: [PATCH] Revert "Make compiled archive generation reproducible" Some platforms we support have a version of GNU tar too old that does not support these options (Amazon Linux 2, CentOS 7). Also some platforms do not have GNU tar, and needs tweaking to use it (OSX). This reverts commit 24b0eca9c626398479162d5d69a15ed07c2bed39. --- lib/vanagon/platform.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vanagon/platform.rb b/lib/vanagon/platform.rb index a04be9b5..8f6ad0d6 100644 --- a/lib/vanagon/platform.rb +++ b/lib/vanagon/platform.rb @@ -550,8 +550,8 @@ def generate_compiled_archive(project) "mkdir #{archive_directory}", "gunzip -c #{name_and_version}.tar.gz | '#{tar}' -C #{archive_directory} -xf -", "rm #{name_and_version}.tar.gz", - "cd #{archive_directory}/#{name_and_version}; #{bill_of_materials_command}; #{tar} cf ../../#{name_and_version_and_platform}.tar --sort=name --pax-option='delete=atime,delete=ctime' --clamp-mtime --mtime='#{Time.at(project.source_date_epoch).strftime('%Y-%m-%dT%H:%M:%SZ')}' *", - "gzip --no-name -9c #{name_and_version_and_platform}.tar > #{name_and_version_and_platform}.tar.gz", + "cd #{archive_directory}/#{name_and_version}; #{bill_of_materials_command}; #{tar} cf ../../#{name_and_version_and_platform}.tar *", + "gzip -9c #{name_and_version_and_platform}.tar > #{name_and_version_and_platform}.tar.gz", "cp build_metadata.#{name_and_platform}.json output/#{name_and_version_and_platform}.json", "cp bill-of-materials output/#{name_and_version_and_platform}-bill-of-materials ||:", "cp #{name_and_version_and_platform}.tar.gz output",