Skip to content

Commit 2c0f0f4

Browse files
authored
Tweak how IS_OFFICIAL is determined (unbreaks Julia 1.11) (#883)
* Fix `banner` usage on Julia 1.11 * Resolve example/MyLib/build * Check `Base.TAGGED_RELEASE_BANNER` to see if we are on an official build
1 parent 037a72e commit 2c0f0f4

3 files changed

Lines changed: 20 additions & 13 deletions

File tree

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
99
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1010
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1111
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
12+
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
1213
RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
1314
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
1415
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

examples/MyLib/build/Manifest.toml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,26 @@ uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
3838
[[LibCURL]]
3939
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
4040
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
41-
version = "0.6.3"
41+
version = "0.6.4"
4242

4343
[[LibCURL_jll]]
4444
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
4545
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
46-
version = "7.84.0+0"
46+
version = "8.0.1+1"
4747

4848
[[LibGit2]]
49-
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
49+
deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
5050
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
5151

52+
[[LibGit2_jll]]
53+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
54+
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
55+
version = "1.6.4+0"
56+
5257
[[LibSSH2_jll]]
5358
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
5459
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
55-
version = "1.10.2+0"
60+
version = "1.11.0+1"
5661

5762
[[Libdl]]
5863
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -67,26 +72,26 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
6772
[[MbedTLS_jll]]
6873
deps = ["Artifacts", "Libdl"]
6974
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
70-
version = "2.28.2+0"
75+
version = "2.28.2+1"
7176

7277
[[MozillaCACerts_jll]]
7378
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
74-
version = "2022.10.11"
79+
version = "2023.1.10"
7580

7681
[[NetworkOptions]]
7782
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
7883
version = "1.2.0"
7984

8085
[[PackageCompiler]]
81-
deps = ["Artifacts", "Glob", "LazyArtifacts", "Libdl", "Pkg", "Printf", "RelocatableFolders", "TOML", "UUIDs"]
86+
deps = ["Artifacts", "Glob", "LazyArtifacts", "Libdl", "Pkg", "Printf", "REPL", "RelocatableFolders", "TOML", "UUIDs"]
8287
path = "../../.."
8388
uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
8489
version = "2.1.7"
8590

8691
[[Pkg]]
8792
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
8893
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
89-
version = "1.9.0"
94+
version = "1.10.0"
9095

9196
[[Printf]]
9297
deps = ["Unicode"]
@@ -97,7 +102,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
97102
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
98103

99104
[[Random]]
100-
deps = ["SHA", "Serialization"]
105+
deps = ["SHA"]
101106
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
102107

103108
[[RelocatableFolders]]
@@ -142,14 +147,14 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
142147
[[Zlib_jll]]
143148
deps = ["Libdl"]
144149
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
145-
version = "1.2.13+0"
150+
version = "1.2.13+1"
146151

147152
[[nghttp2_jll]]
148153
deps = ["Artifacts", "Libdl"]
149154
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
150-
version = "1.48.0+0"
155+
version = "1.52.0+1"
151156

152157
[[p7zip_jll]]
153158
deps = ["Artifacts", "Libdl"]
154159
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
155-
version = "17.4.0+0"
160+
version = "17.4.0+2"

src/PackageCompiler.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module PackageCompiler
22

33
using Base: active_project
4+
using REPL
45
using Libdl: Libdl
56
using Pkg: Pkg
67
using Printf
@@ -710,7 +711,7 @@ end
710711
# App #
711712
#######
712713

713-
const IS_OFFICIAL = occursin("Official https://julialang.org/ release", sprint(Base.banner))
714+
const IS_OFFICIAL = Base.TAGGED_RELEASE_BANNER == "Official https://julialang.org/ release"
714715
function warn_official()
715716
if !IS_OFFICIAL
716717
@warn "PackageCompiler: This does not look like an official Julia build, functionality may suffer." _module=nothing _file=nothing

0 commit comments

Comments
 (0)