🐛 Ignore digest when comparing

Author: nikolaik

src/docker_python_nodejs/cli.py

@@ -11,6 +11,7 @@
     decide_version_combinations,
     find_new_or_updated,
     load_build_contexts,
+    load_versions,
     persist_versions,
     supported_versions,
 )
@@ -37,13 +38,15 @@ def run_dockerfile(args: CLIArgs) -> None:
 def run_build_matrix(args: CLIArgs) -> None:
     supported_python_versions, supported_nodejs_versions = supported_versions()
     versions = decide_version_combinations(args.distros, supported_python_versions, supported_nodejs_versions)
-    new_or_updated = find_new_or_updated(versions, args.force)
+    current_versions = load_versions()
+    new_or_updated = find_new_or_updated(versions, current_versions, args.force)
     build_matrix(new_or_updated, args.event)
 
 
 def run_release(args: CLIArgs) -> None:
     versions = load_build_contexts(args.builds_dir)
-    new_or_updated = find_new_or_updated(versions, args.force)
+    current_versions = load_versions()
+    new_or_updated = find_new_or_updated(versions, current_versions, args.force)
     supported_python_versions, supported_nodejs_versions = supported_versions()
     if not new_or_updated:
         logger.info("No new or updated versions")

src/docker_python_nodejs/versions.py

@@ -270,19 +270,23 @@ def load_versions() -> list[BuildVersion]:
 
 def find_new_or_updated(
     versions: list[BuildVersion],
+    current_versions: list[BuildVersion],
     force: bool = False,
 ) -> list[BuildVersion]:
     if force:
         logger.warning("Generating full build matrix because --force is set")
 
-    current_versions = load_versions()
     current_versions_dict = {ver.key: ver for ver in current_versions}
     versions_dict = {ver.key: ver for ver in versions}
     new_or_updated: list[BuildVersion] = []
 
     for key, ver in versions_dict.items():
+        current_ver = current_versions_dict.get(key)
+        if current_ver is not None:
+            current_ver.digest = ""  # Ignore digest when comparing
+
         # does key exist and are version dicts equal?
-        updated = key in current_versions_dict and ver != current_versions_dict[key]
+        updated = current_ver and ver != current_ver
         new = key not in current_versions_dict
         if new or updated or force:
             new_or_updated.append(ver)

tests/test_all.py

@@ -1,3 +1,4 @@
+import copy
 import dataclasses
 import json
 from pathlib import Path
@@ -15,6 +16,7 @@
     decide_nodejs_versions,
     decide_version_combinations,
     fetch_supported_nodejs_versions,
+    find_new_or_updated,
     load_build_contexts,
     scrape_supported_python_versions,
 )
@@ -264,3 +266,25 @@ def test_load_build_contexts(build_version: BuildVersion, tmp_path: Path) -> Non
     versions = load_build_contexts(tmp_path)
     assert len(versions) == 1
     assert versions[0].key == ver.key
+
+
+def test_find_new_or_updated_with_digest() -> None:
+    new = BuildVersion(
+        key="python3.11-nodejs20",
+        python="3.11",
+        python_canonical="3.11.3",
+        python_image="3.11.3-trixie",
+        nodejs="20",
+        nodejs_canonical="20.2.0",
+        distro="trixie",
+        platforms=[
+            "linux/amd64",
+            "linux/arm64",
+        ],
+    )
+    existing = copy.deepcopy(new)
+    existing.digest = "sha256:abcdef1234567890"
+
+    res = find_new_or_updated([new], [existing])
+
+    assert len(res) == 0