Merge pull request #10982 from sjackman/build-info-oldest-cpu

build_info: Add oldest_cpu_family
This commit is contained in:
Shaun Jackman 2021-04-02 19:10:49 -07:00 committed by GitHub
commit d5b972476e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -21,7 +21,10 @@ class DevelopmentTools
end
def build_system_info
generic_build_system_info.merge "glibc_version" => OS::Linux::Glibc.version
generic_build_system_info.merge({
"glibc_version" => OS::Linux::Glibc.version,
"oldest_cpu_family" => Hardware.oldest_cpu,
})
end
end
end

View File

@ -246,11 +246,14 @@ class GitHubPackages
(tab["built_on"]["glibc_version"] if tab["built_on"].present?) || "2.23"
end
variant = tab["oldest_cpu_family"] || "core2" if os == "linux"
platform_hash = {
architecture: architecture,
variant: variant,
os: os,
"os.version" => os_version,
}
}.compact
tar_sha256 = Digest::SHA256.hexdigest(
Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file),
)