Fix patch version lookup

NathanVaughn · Mar 21, 2024 · 86b21d3 · 86b21d3
1 parent 4329f5a
commit 86b21d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/dev/build_test_version.py b/dev/build_test_version.py
@@ -13,11 +13,6 @@ def main(webtrees_version: str) -> None:
     with open(CACHE_FILE, "w") as fp:
         fp.write(f"{webtrees_version}\n")
 
-    if webtrees_version not in WEBTREES_PATCH:
-        patch_ver = WEBTREES_PATCH["default"]
-    else:
-        patch_ver = WEBTREES_PATCH[webtrees_version]
-
     subprocess.run(
         [
             "docker",
@@ -27,7 +22,7 @@ def main(webtrees_version: str) -> None:
             "--build-arg",
             f"PHP_VERSION={next(v for k, v in WEBTREES_PHP.items() if webtrees_version.startswith(k))}",
             "--build-arg",
-            f"PATCH_VERSION={patch_ver}",
+            f'PATCH_VERSION={WEBTREES_PATCH.get(webtrees_version, WEBTREES_PATCH["default"])}',
             "-t",
             "webtrees:test",
             ".",

diff --git a/dev/versionchecker.py b/dev/versionchecker.py
@@ -134,7 +134,10 @@ def main(forced_versions: Optional[List[str]] = None) -> None:
                 for key, value in WEBTREES_PHP.items()
                 if missing_version_dict[VERSION_KEY].startswith(key)
             ),
-            "patch_version" "prerelease": missing_version_dict["prerelease"],
+            "patch_version": WEBTREES_PATCH.get(
+                missing_version_dict[VERSION_KEY], WEBTREES_PATCH["default"]
+            ),
+            "prerelease": missing_version_dict["prerelease"],
             "src_url": missing_version_dict["html_url"],
         }
         return_data["include"].append(version_data)