Skip to content

Commit 0f831d3

Browse files
authored
Update expected SHAs of tarballs (#1401)
BinaryBuilderBase introduced a change in the compiler wrappers, which affects the content of the generated binary files.
1 parent d41ddc8 commit 0f831d3

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
3636
[compat]
3737
ArgParse = "1.1"
3838
Binutils_jll = "2"
39-
BinaryBuilderBase = "1.39.1"
39+
BinaryBuilderBase = "1.40.0"
4040
Downloads = "1"
4141
GitHub = "5.1"
4242
HTTP = "0.8, 0.9, 1"

test/auditing.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ end
730730
# Ensure the build products were created
731731
@test isfile(tarball_path)
732732
# Ensure reproducibility of build
733-
@test build_output_meta[platform][3] == Base.SHA1("0165cfbbbb8e521707299d649359f2bfdc28f204")
733+
@test build_output_meta[platform][3] == Base.SHA1("8805236c0abcca3b393e184f67bb89291b3f2d28")
734734

735735
# Unpack it somewhere else
736736
@test verify(tarball_path, tarball_hash)
@@ -797,7 +797,7 @@ end
797797
platform = Platform("i686", "windows")
798798
expected_git_shas = Dict(
799799
v"4" => Base.SHA1("1b625af3aa29c4b4b398f1eeaccc83d781bca1a5"),
800-
v"6" => Base.SHA1("61767c3a66a66caeed84ee747a95021a94e77e3d"),
800+
v"6" => Base.SHA1("a65f72e29a87cc8a5f048069abf6a250527563c9"),
801801
)
802802
@testset "gcc version $(gcc_version)" for gcc_version in (v"4", v"6")
803803
mktempdir() do build_path
@@ -833,7 +833,9 @@ end
833833
tarball_path, tarball_hash = build_output_meta[platform][1:2]
834834
@test isfile(tarball_path)
835835
# Ensure reproducibility of build
836-
@test build_output_meta[platform][3] == expected_git_shas[gcc_version]
836+
# TODO: fix reproducibility with GCC v5+:
837+
# https://github.com/JuliaPackaging/BinaryBuilderBase.jl/pull/435#issuecomment-3185007378
838+
@test build_output_meta[platform][3] == expected_git_shas[gcc_version] skip=gcc_version>=v"5"
837839
end
838840
end
839841
end

test/building.jl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -257,26 +257,26 @@ end
257257
]
258258
expected_git_shas = Dict(
259259
v"4" => Dict(
260-
x86_64_linux => Base.SHA1("fb3897274fe9b293eb6bfb65063895946e655114"),
261-
ppc64le_linux => Base.SHA1("53a4e6c7e7d05bf245a8b794133b963bb1ebb1c2"),
262-
armv7l_linux => Base.SHA1("28fc03c35a4d30da70fbdefc69ecc6b6bf93f2fb"),
263-
aarch64_linux => Base.SHA1("c1c06efddc8bdce7b33fc9d8b6859f3c63e429ea"),
260+
x86_64_linux => Base.SHA1("cc2ad05285813f6b70bac6241a8fc869c5d331ee"),
261+
ppc64le_linux => Base.SHA1("d53d766c5a098420dbdc8fa7b79e343860096ac4"),
262+
armv7l_linux => Base.SHA1("673b4a548ef7dbc07a9230e094b199c48018bc6e"),
263+
aarch64_linux => Base.SHA1("8938e2f1f3c25ebfa4fb1f5fceb2dacc241c95c4"),
264264
x86_64_macos => Base.SHA1("b0f9ef3b42b30f9085d4f9d60c3ea441554c442f"),
265265
i686_windows => Base.SHA1("f39858ccc34a63a648cf21d33ae236bfdd706d09"),
266266
),
267267
v"5" => Dict(
268-
x86_64_linux => Base.SHA1("743b2eac2e096281a2c69f95a2f58a4583824a84"),
269-
ppc64le_linux => Base.SHA1("b663282a6101647c0aa87043a632b6cdc08f761f"),
270-
armv7l_linux => Base.SHA1("9a3273d5c7a41e7c2a5ab58b6b69db49a8533bc1"),
271-
aarch64_linux => Base.SHA1("4bab3a85aceb3e589989f1a11a2f092c5038a6e0"),
268+
x86_64_linux => Base.SHA1("a92857b327fcaddfe0e31081ac8cd96e3e0ec2ea"),
269+
ppc64le_linux => Base.SHA1("e47c4e8ba3cd44a13b2e0eeb49f28fe0f958e25b"),
270+
armv7l_linux => Base.SHA1("6e5a108b68b2f12dae88a21b756e15c61eaefd6b"),
271+
aarch64_linux => Base.SHA1("b1afb1cbfa5a919528c869cedf96a8fe70687a27"),
272272
x86_64_macos => Base.SHA1("9ddfd323ed25fc02394067c6e863f1cf826a9e5e"),
273273
i686_windows => Base.SHA1("9390a3c24a8e274e6d7245c6c977f97b406bc3f5"),
274274
),
275275
v"6" => Dict(
276-
x86_64_linux => Base.SHA1("0b152c2cc8ff2af82f8d2d0adbbe26e0961131ed"),
277-
ppc64le_linux => Base.SHA1("97b7e5682b3cadc873644931b17894fa2ff05335"),
278-
armv7l_linux => Base.SHA1("267b443b17b99ca2a14ea93d2afc2cce51cad05e"),
279-
aarch64_linux => Base.SHA1("b396b1d94aba8642a68122a3515b26e4397217a0"),
276+
x86_64_linux => Base.SHA1("8e18b9a6fd6bebcbf350f4605f59da588c3f91d8"),
277+
ppc64le_linux => Base.SHA1("5595cc99163816896ba3982e458a92086dea590d"),
278+
armv7l_linux => Base.SHA1("f485bbe50a8fc242a40c2a67ca6f23225f5cfcd7"),
279+
aarch64_linux => Base.SHA1("839b5fb66e49f38700c8f6cacadd3cc11785c3bb"),
280280
x86_64_macos => Base.SHA1("b211e8c87b83e820416757d6d2985bcd19db7f24"),
281281
i686_windows => Base.SHA1("ae50af4ca8651cb3c8f71f34d0b66ca0d8f14a99"),
282282
),
@@ -340,7 +340,7 @@ end
340340
Dependency[],
341341
)
342342
# Test build reproducibility
343-
@test build_output_meta[p][3] == Base.SHA1("95e005d9b057b3a28af61189b9af5613127416a6")
343+
@test build_output_meta[p][3] == Base.SHA1("f347485b5f271afa04dcec5b9645550664d5e6dc")
344344
end
345345
end
346346
end

0 commit comments

Comments
 (0)