Skip to content

Commit d972ad8

Browse files
authored
Upgrade to RegistryTools v2, and require at least RegistryTools 2.1.0 (#1269)
* Revert "Revert "Require at least RegistryTools 2.1.0 (#1267)" (#1268)" This reverts commit 3772aef. * Upgrade from RegistryTools v1 to RegistryToolsv2
1 parent bdde95a commit d972ad8

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Manifest.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,15 @@ version = "1.2.2"
364364

365365
[[deps.Registrator]]
366366
deps = ["AutoHashEquals", "Base64", "Dates", "Distributed", "FileWatching", "GitForge", "GitHub", "HTTP", "JSON", "LibGit2", "Logging", "MbedTLS", "Mocking", "Mustache", "Mux", "Pkg", "RegistryTools", "Serialization", "Sockets", "TimeToLive", "URIs", "UUIDs", "ZMQ"]
367-
git-tree-sha1 = "64a7d49e56cf609973854cdd48eb265ac418f6ee"
367+
git-tree-sha1 = "7242ef64be5953fac9bf8b3efa3a7c4d2d44ca09"
368368
uuid = "4418983a-e44d-11e8-3aec-9789530b3b3e"
369-
version = "1.6.0"
369+
version = "1.8.0"
370370

371371
[[deps.RegistryTools]]
372372
deps = ["AutoHashEquals", "LibGit2", "Pkg", "SHA", "UUIDs"]
373-
git-tree-sha1 = "47ab54eff26db6be2496e6300d959e16d8203723"
373+
git-tree-sha1 = "94060d91cc152680842357aacb402afbd06601aa"
374374
uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
375-
version = "1.9.1"
375+
version = "2.1.0"
376376

377377
[[deps.Requires]]
378378
deps = ["UUIDs"]

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ObjectFile = "0.3.6"
4444
OutputCollectors = "0.1"
4545
PkgLicenses = "0.2"
4646
Registrator = "1.1"
47-
RegistryTools = "1.3.4"
47+
RegistryTools = "2.1"
4848
Scratch = "1.0"
4949
ghr_jll = "0.13, 0.14"
5050
julia = "1.7"

src/AutoBuild.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,12 @@ function register_jll(name, build_version, dependencies, julia_compat;
566566
cache.registries[registry_url] = Base.UUID("23338594-aafe-5451-b93e-139f81909106")
567567
jllwrappers_compat = isempty(augment_platform_block) ? DEFAULT_JLLWRAPPERS_VERSION_SPEC : "1.4.0"
568568
project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies, julia_compat; jllwrappers_compat, lazy_artifacts, augment_platform_block))
569+
project_file = joinpath(mktempdir(), "Project.toml")
570+
Pkg.Types.write_project(project, project_file)
569571
errors = setdiff(RegistryTools.registrator_errors, [:version_less_than_all_existing])
570572
reg_branch = RegistryTools.register(
571573
"https://github.com/$(deploy_repo).git",
572-
project,
574+
project_file,
573575
wrapper_tree_hash;
574576
registry=registry_url,
575577
cache=cache,

0 commit comments

Comments
 (0)