From d1c66479341cca937ba538fecb8780532b6ea58c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 3 Apr 2021 17:15:24 +1300 Subject: [PATCH] qa: Point univalue update checker at correct upstream Bitcoin Core doesn't actually use tags for managing versions of their forked dependencies, so we should separately rework this logic for all of the subtree-managed dependencies. But this at least prevents false positives. --- qa/zcash/postponed-updates.txt | 4 ---- qa/zcash/updatecheck.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 72ead41bd..db6a3525f 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -14,10 +14,6 @@ libcxx 11.1.0 2021-07-01 bdb 18.1.40 2021-07-01 -univalue 1.0.4 2021-07-01 -univalue 1.0.5 2021-07-01 -univalue 1.1.1 2021-07-01 - # Boost 1.75 starts using the statx syscall where available, which causes # permission errors in some environments. # https://github.com/zcash/zcash/issues/4945 diff --git a/qa/zcash/updatecheck.py b/qa/zcash/updatecheck.py index 069768b82..90e75bff6 100755 --- a/qa/zcash/updatecheck.py +++ b/qa/zcash/updatecheck.py @@ -92,8 +92,8 @@ def get_dependency_list(): { "v1.13": (1, 13) }), LevelDbVersionGetter()), Dependency("univalue", - GithubTagReleaseLister("jgarzik", "univalue", "^v(\d+)\.(\d+)\.(\d+)$", - { "v1.1.1": (1, 1, 1) }), + GithubTagReleaseLister("bitcoin-core", "univalue", "^v(\d+)\.(\d+)\.(\d+)$", + { "v1.0.1": (1, 0, 1) }), UnivalueVersionGetter()), Dependency("utfcpp", GithubTagReleaseLister("nemtrif", "utfcpp", "^v(\d+)\.(\d+)(?:\.(\d+))?$",