Skip to content

Commit 696d9f9

Browse files
authored
[AutoBuild] Increase compat of JLLWrappers to v1.2.0 (#986)
1 parent 77baf54 commit 696d9f9

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
123123
version = "0.1.14"
124124

125125
[[JLLWrappers]]
126-
git-tree-sha1 = "04b49c556240b62d5a799e94c63d5fc14d3c07cd"
126+
git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0"
127127
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
128-
version = "1.1.4"
128+
version = "1.2.0"
129129

130130
[[JSON]]
131131
deps = ["Dates", "Mmap", "Parsers", "Unicode"]

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
set -e
2626
$(JULIA) -e 'using Pkg; Pkg.instantiate()'
2727
$(JULIA) -e 'using BinaryBuilder; BinaryBuilder.versioninfo()'
28-
$(JULIA) -e 'using Pkg; Pkg.status()'
28+
$(JULIA) -e 'using Pkg; Pkg.status(; mode=PKGMODE_MANIFEST)'
2929
name: SystemInfo
3030
3131
- job: Test
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- bash: |
4949
set -e
50-
$(JULIA) --check-bounds=yes --inline=yes -e 'using Pkg; Pkg.Registry.update(); Pkg.test(coverage=true)'
50+
$(JULIA) --check-bounds=yes --inline=yes -e 'using Pkg; Pkg.Registry.update(); Pkg.instantiate(); Pkg.test(coverage=true)'
5151
$(JULIA) -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
5252
name: Test
5353

src/AutoBuild.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ function build_project_dict(name, version, dependencies::Array{Dependency}, juli
13791379
"deps" => Dict{String,Any}(),
13801380
# We require at least Julia 1.3+, for Pkg.Artifacts support, but we only claim
13811381
# Julia 1.0+ by default so that empty JLLs can be installed on older versions.
1382-
"compat" => Dict{String,Any}("JLLWrappers" => "1.1.0",
1382+
"compat" => Dict{String,Any}("JLLWrappers" => "1.2.0",
13831383
"julia" => "$(julia_compat)")
13841384
)
13851385
for dep in dependencies

test/basic.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ end
187187
@test dict["name"] == "$(name)_jll"
188188
@test dict["version"] == "1.0.0"
189189
@test dict["uuid"] == "8fcd9439-76b0-55f4-a525-bad0597c05d8"
190-
@test dict["compat"] == Dict{String,Any}("julia" => "1.0", "JLLWrappers" => "1.1.0")
190+
@test dict["compat"] == Dict{String,Any}("julia" => "1.0", "JLLWrappers" => "1.2.0")
191191
@test all(in.(
192192
(
193193
"Pkg" => "44cfe95a-1eb2-52ea-b672-e2afdf69b78f",
@@ -212,10 +212,10 @@ end
212212

213213
# Ensure passing a Julia dependency bound works
214214
dict = build_project_dict(name, version, dependencies, "1.4")
215-
@test dict["compat"] == Dict{String,Any}("julia" => "1.4", "JLLWrappers" => "1.1.0")
215+
@test dict["compat"] == Dict{String,Any}("julia" => "1.4", "JLLWrappers" => "1.2.0")
216216

217217
dict = build_project_dict(name, version, dependencies, "~1.4")
218-
@test dict["compat"] == Dict{String,Any}("julia" => "~1.4", "JLLWrappers" => "1.1.0")
218+
@test dict["compat"] == Dict{String,Any}("julia" => "~1.4", "JLLWrappers" => "1.2.0")
219219

220220
@test_throws ErrorException build_project_dict(name, version, dependencies, "nonsense")
221221

test/jll.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module TestJLL end
1717
"XZ_jll" => "ffd25f8a-64ca-5728-b0f7-c24cf3aae800")
1818
@test project["name"] == "LibFoo_jll"
1919
@test project["uuid"] == "b250f842-3251-58d3-8ee4-9a24ab2bab3f"
20-
@test project["compat"] == Dict("julia" => "1.0", "XZ_jll" => "=2.4.6", "JLLWrappers" => "1.1.0")
20+
@test project["compat"] == Dict("julia" => "1.0", "XZ_jll" => "=2.4.6", "JLLWrappers" => "1.2.0")
2121
@test project["version"] == "1.3.5"
2222
# Make sure BuildDependency's don't find their way to the project
2323
@test_throws MethodError build_project_dict("LibFoo", v"1.3.5", [Dependency("Zlib_jll"), BuildDependency("Xorg_util_macros_jll")])

0 commit comments

Comments
 (0)