From acb07c74245ed0d01ee7ba4ec6fcc2854518a360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Thu, 24 Nov 2022 21:55:29 +0000 Subject: [PATCH] Fix expected hash of macOS builds They changed because of the change of the value of `-Wl,-sdk_version` in BinaryBuilderBase. --- Manifest.toml | 154 +++++++++++++++++++++++++++-------------------- Project.toml | 2 +- test/building.jl | 6 +- 3 files changed, 92 insertions(+), 70 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 1af993919..076d9745c 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -31,17 +31,17 @@ version = "0.2.0" uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[deps.BinaryBuilderBase]] -deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "LibGit2_jll", "Libdl", "Logging", "OrderedCollections", "OutputCollectors", "Pkg", "ProgressMeter", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"] -git-tree-sha1 = "af7cdc65f6ef4e2434baff93cf2d805cb54efbe6" +deps = ["CodecZlib", "Downloads", "HistoricalStdlibVersions", "InteractiveUtils", "JSON", "LibGit2", "LibGit2_jll", "Libdl", "Logging", "OrderedCollections", "OutputCollectors", "Pkg", "ProgressMeter", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"] +git-tree-sha1 = "e6b4fe90822a74607a7750603ac421623eb95fbd" repo-rev = "master" repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git" uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e" -version = "1.18.0" +version = "1.20.0" [[deps.BitFlags]] -git-tree-sha1 = "84259bb6172806304b9101094a7cc4bc6f56dbc6" +git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" -version = "0.1.5" +version = "0.1.7" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] @@ -50,19 +50,19 @@ uuid = "944b1d66-785c-5afd-91f1-9de20f533193" version = "0.7.0" [[deps.Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "78bee250c6826e1cf805a88b7f1e86025275d208" +deps = ["Dates", "LinearAlgebra", "UUIDs"] +git-tree-sha1 = "aaabba4ce1b7f8a9b34c015053d3b1edf60fa49c" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.46.0" +version = "4.4.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" [[deps.DataAPI]] -git-tree-sha1 = "1106fa7e1256b402a86a8e7b15c00c85036fef49" +git-tree-sha1 = "e08915633fcb3ea83bf9d6126292e5bc5c739922" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.11.0" +version = "1.13.0" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -73,10 +73,6 @@ version = "1.0.0" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[deps.DelimitedFiles]] -deps = ["Mmap"] -uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" - [[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -92,30 +88,30 @@ version = "0.1.8" [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "94f5101b96d2d968ace56f7f2db19d0a5f592e28" +git-tree-sha1 = "7be5f99f7d15578798f338f5433b6c432ea8037b" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.15.0" +version = "1.16.0" [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.GitForge]] -deps = ["Dates", "HTTP", "JSON2"] -git-tree-sha1 = "95d96738dfa0ebb5c447b792d7477bee18da2391" +deps = ["Dates", "HTTP", "JSON3", "StructTypes", "TimeZones", "UUIDs"] +git-tree-sha1 = "002d0a6b394953cabb3c1b3566d4645c2a395012" uuid = "8f6bce27-0656-5410-875b-07a5572985df" -version = "0.1.8" +version = "0.4.1" [[deps.GitHub]] deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets", "SodiumSeal", "URIs"] -git-tree-sha1 = "f1d3170f588c7610b568c9a97971915100dd51e8" +git-tree-sha1 = "08ee34cdc529bd4e631f661595c2eb695515bdbc" uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26" -version = "5.7.3" +version = "5.8.1" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "Dates", "IniFile", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "4abede886fcba15cd5fd041fef776b230d004cee" +git-tree-sha1 = "e1acc37ed078d99a714ed8376446f92a5535ca65" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.4.0" +version = "1.5.5" [[deps.Hiccup]] deps = ["MacroTools", "Test"] @@ -123,11 +119,22 @@ git-tree-sha1 = "6187bb2d5fcbb2007c39e7ac53308b0d371124bd" uuid = "9fb69e20-1954-56bb-a84f-559cc56a8ff7" version = "0.2.2" +[[deps.HistoricalStdlibVersions]] +git-tree-sha1 = "458e3bf9aecc34287e6874bb0cd2f7e87d67c137" +uuid = "6df8b67a-e8a0-4029-b4b7-ac196fe72102" +version = "1.0.0" + [[deps.IniFile]] git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625" uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" version = "0.5.1" +[[deps.InlineStrings]] +deps = ["Parsers"] +git-tree-sha1 = "0cf92ec945125946352f3d46c96976ab972bde6f" +uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" +version = "1.3.2" + [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" @@ -139,9 +146,9 @@ version = "1.0.0" [[deps.JLD2]] deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "6c38bbe47948f74d63434abed68bdfc8d2c46b99" +git-tree-sha1 = "18dd357553912b6adc23b5f721e4be19930140c6" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.23" +version = "0.4.28" [[deps.JLLWrappers]] deps = ["Preferences"] @@ -155,11 +162,15 @@ git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.3" -[[deps.JSON2]] -deps = ["Dates", "Parsers", "Test"] -git-tree-sha1 = "dcc3c2d9bdc036677a031ea97b76925983ca1f18" -uuid = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3" -version = "0.3.4" +[[deps.JSON3]] +deps = ["Dates", "Mmap", "Parsers", "SnoopPrecompile", "StructTypes", "UUIDs"] +git-tree-sha1 = "84b10656a41ef564c39d2d477d7236966d2b5683" +uuid = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" +version = "1.12.0" + +[[deps.LazyArtifacts]] +deps = ["Artifacts", "Pkg"] +uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] @@ -199,9 +210,9 @@ version = "0.4.9" [[deps.MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf" +git-tree-sha1 = "42324d08725e200c23d4dfb549e0d5d89dede2d2" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.9" +version = "0.5.10" [[deps.Markdown]] deps = ["Base64"] @@ -209,9 +220,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] -git-tree-sha1 = "6872f9594ff273da6d13c7c1a1545d5a8c7d0c1c" +git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.1.6" +version = "1.1.7" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] @@ -222,9 +233,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[deps.Mocking]] deps = ["Compat", "ExprTools"] -git-tree-sha1 = "29714d0a7a8083bba8427a4fbfb00a540c681ce7" +git-tree-sha1 = "c272302b22479a24d1cf48c114ad702933414f80" uuid = "78c3b35d-d492-501b-9361-3d52fe80e533" -version = "0.7.3" +version = "0.7.5" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" @@ -237,9 +248,9 @@ version = "1.0.14" [[deps.Mux]] deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "MbedTLS", "Pkg", "Sockets"] -git-tree-sha1 = "5e3585fbdb1a4ac9c8d460429b65c0e60b966a9d" +git-tree-sha1 = "0bdaa479939d2a1f85e2f93e38fbccfcb73175a5" uuid = "a975b10e-0019-58db-a62f-e48ff68538c9" -version = "1.0.0" +version = "1.0.1" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -256,15 +267,15 @@ uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "02be9f845cb58c2d6029a6d5f67f4e0af3237814" +git-tree-sha1 = "df6830e37943c7aaa10023471ca47fb3065cc3c4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.1.3" +version = "1.3.2" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "e60321e3f2616584ff98f0a4f18d98ae6f89bbb3" +git-tree-sha1 = "f6e9dba33f9f2c44e08a020b0caf6903be540004" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.17+0" +version = "1.1.19+0" [[deps.OrderedCollections]] git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" @@ -277,10 +288,10 @@ uuid = "6c11c7d4-943b-4e2b-80de-f2cfc2930a8c" version = "0.1.1" [[deps.Parsers]] -deps = ["Dates"] -git-tree-sha1 = "3d5bf43e3e8b412656404ed9466f1dcbf7c50269" +deps = ["Dates", "SnoopPrecompile"] +git-tree-sha1 = "b64719e8b4504983c7fca6cc9db3ebc8acc2a4d6" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.4.0" +version = "2.5.1" [[deps.Pidfile]] deps = ["FileWatching", "Test"] @@ -322,16 +333,22 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" deps = ["SHA", "Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[deps.RecipesBase]] +deps = ["SnoopPrecompile"] +git-tree-sha1 = "d12e612bba40d189cead6ff857ddb67bd2e6a387" +uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" +version = "1.3.1" + [[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.2.2" [[deps.Registrator]] -deps = ["AutoHashEquals", "Base64", "Dates", "Distributed", "FileWatching", "GitForge", "GitHub", "HTTP", "JSON", "LibGit2", "Logging", "MbedTLS", "Mocking", "Mustache", "Mux", "Pkg", "RegistryTools", "Serialization", "Sockets", "TimeToLive", "UUIDs", "ZMQ"] -git-tree-sha1 = "ba5ce9c64c5168809e489556a48e1bd3a54812d0" +deps = ["AutoHashEquals", "Base64", "Dates", "Distributed", "FileWatching", "GitForge", "GitHub", "HTTP", "JSON", "LibGit2", "Logging", "MbedTLS", "Mocking", "Mustache", "Mux", "Pkg", "RegistryTools", "Serialization", "Sockets", "TimeToLive", "URIs", "UUIDs", "ZMQ"] +git-tree-sha1 = "76a6df170b381dbbae2a0e386e59e9d894ba4290" uuid = "4418983a-e44d-11e8-3aec-9789530b3b3e" -version = "1.4.1" +version = "1.5.0" [[deps.RegistryTools]] deps = ["AutoHashEquals", "LibGit2", "Pkg", "SHA", "UUIDs"] @@ -357,15 +374,16 @@ version = "1.1.1" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[deps.SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - [[deps.SimpleBufferStream]] git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.1.0" +[[deps.SnoopPrecompile]] +git-tree-sha1 = "f604441450a3c0569830946e5b33b78c928e1a85" +uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c" +version = "1.0.1" + [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -375,20 +393,18 @@ git-tree-sha1 = "80cef67d2953e33935b41c6ab0a178b9987b1c99" uuid = "2133526b-2bfb-4018-ac12-889fb3908a75" version = "0.1.1" -[[deps.SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[[deps.Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - [[deps.StructIO]] deps = ["Test"] git-tree-sha1 = "010dc73c7146869c042b49adcdb6bf528c12e859" uuid = "53d494c1-5632-5724-8f4c-31dff12d585f" version = "0.3.0" +[[deps.StructTypes]] +deps = ["Dates", "UUIDs"] +git-tree-sha1 = "ca4bccb03acf9faaf4137a9abc1881ed1841aa70" +uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" +version = "1.10.0" + [[deps.TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" @@ -401,9 +417,9 @@ version = "1.0.1" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"] -git-tree-sha1 = "2d7164f7b8a066bcfa6224e67736ce0eb54aef5b" +git-tree-sha1 = "c79322d36826aa2f4fd8ecfa96ddb47b174ac78d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.9.0" +version = "1.10.0" [[deps.Tar]] deps = ["ArgTools", "SHA"] @@ -424,6 +440,12 @@ git-tree-sha1 = "1f1389007d16385ec02e497bef6c2caffba99b65" uuid = "37f0c46e-897f-50ef-b453-b26c3eed3d6c" version = "0.3.0" +[[deps.TimeZones]] +deps = ["Dates", "Downloads", "InlineStrings", "LazyArtifacts", "Mocking", "Printf", "RecipesBase", "Scratch", "Unicode"] +git-tree-sha1 = "d634a3641062c040fc8a7e2a3ea17661cc159688" +uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" +version = "1.9.0" + [[deps.TranscodingStreams]] deps = ["Random", "Test"] git-tree-sha1 = "8a75929dcd3c38611db2f8d08546decb514fcadf" @@ -431,9 +453,9 @@ uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" version = "0.9.9" [[deps.URIs]] -git-tree-sha1 = "e59ecc5a41b000fa94423a578d29290c7266fc10" +git-tree-sha1 = "ac00576f90d8a259f2c9d823e91d1de3fd44d348" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.4.0" +version = "1.4.1" [[deps.UUIDs]] deps = ["Random", "SHA"] @@ -444,9 +466,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[deps.ZMQ]] deps = ["FileWatching", "Sockets", "ZeroMQ_jll"] -git-tree-sha1 = "fc68e8a3719166950a0f3e390a14c7302c48f8de" +git-tree-sha1 = "356d2bdcc0bce90aabee1d1c0f6d6f301eda8f77" uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1" -version = "1.2.1" +version = "1.2.2" [[deps.ZeroMQ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "libsodium_jll"] diff --git a/Project.toml b/Project.toml index bb7f715ab..b54e8d9e0 100644 --- a/Project.toml +++ b/Project.toml @@ -33,7 +33,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533" [compat] ArgParse = "1.1" -BinaryBuilderBase = "1.18" +BinaryBuilderBase = "1.20" GitHub = "5.1" HTTP = "0.8, 0.9, 1" JLD2 = "0.1.6, 0.2, 0.3, 0.4" diff --git a/test/building.jl b/test/building.jl index f34b782cb..435c2f0dc 100644 --- a/test/building.jl +++ b/test/building.jl @@ -200,7 +200,7 @@ end ppc64le_linux => Base.SHA1("53a4e6c7e7d05bf245a8b794133b963bb1ebb1c2"), armv7l_linux => Base.SHA1("28fc03c35a4d30da70fbdefc69ecc6b6bf93f2fb"), aarch64_linux => Base.SHA1("c1c06efddc8bdce7b33fc9d8b6859f3c63e429ea"), - x86_64_macos => Base.SHA1("6d7c6812ed8d0deb69d47ae467ea4fee9f691e34"), + x86_64_macos => Base.SHA1("b0f9ef3b42b30f9085d4f9d60c3ea441554c442f"), i686_windows => Base.SHA1("f39858ccc34a63a648cf21d33ae236bfdd706d09"), ), v"5" => Dict( @@ -208,7 +208,7 @@ end ppc64le_linux => Base.SHA1("b663282a6101647c0aa87043a632b6cdc08f761f"), armv7l_linux => Base.SHA1("9a3273d5c7a41e7c2a5ab58b6b69db49a8533bc1"), aarch64_linux => Base.SHA1("4bab3a85aceb3e589989f1a11a2f092c5038a6e0"), - x86_64_macos => Base.SHA1("86d45de929dfc89dd65cb6222287a1c1309f4d08"), + x86_64_macos => Base.SHA1("9ddfd323ed25fc02394067c6e863f1cf826a9e5e"), i686_windows => Base.SHA1("9390a3c24a8e274e6d7245c6c977f97b406bc3f5"), ), v"6" => Dict( @@ -216,7 +216,7 @@ end ppc64le_linux => Base.SHA1("97b7e5682b3cadc873644931b17894fa2ff05335"), armv7l_linux => Base.SHA1("267b443b17b99ca2a14ea93d2afc2cce51cad05e"), aarch64_linux => Base.SHA1("b396b1d94aba8642a68122a3515b26e4397217a0"), - x86_64_macos => Base.SHA1("b6216a106353f62e611579d88275f244b4923678"), + x86_64_macos => Base.SHA1("b211e8c87b83e820416757d6d2985bcd19db7f24"), i686_windows => Base.SHA1("ae50af4ca8651cb3c8f71f34d0b66ca0d8f14a99"), ), )