merge main

Author: gdams

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/init@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/autobuild@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/analyze@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/upload-sarif@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
         with:
           sarif_file: results.sarif

dockerhub_doc_config_update.py

@@ -187,8 +187,21 @@ def generate_official_image_info(file, ver, pkg, os, dfdir):
     # Fetch the latest manifest block
     official_manifest = Path("official-eclipse-temurin").read_text()
     official_gitcommit = ""
-    if any(tag in official_manifest for tag in tags):
-        official_gitcommit = official_manifest.split("GitCommit: ")[1].split()[0]
+    # Retrieve the latest manifest block
+    all_tags = "|".join(tags)
+    for line in official_manifest.splitlines():
+        if re.search(all_tags, line):
+            # return block starting from the matching line until a blank line
+            official_manifest = "\n".join(
+                official_manifest.splitlines()[
+                    official_manifest.splitlines().index(line) :
+                ]
+            )
+            official_gitcommit = re.search(
+                r"GitCommit: ([a-f0-9]+)", official_manifest
+            ).group(1)
+
+    if official_gitcommit:
         if (
             subprocess.call(
                 [
@@ -222,13 +235,14 @@ def generate_official_image_info(file, ver, pkg, os, dfdir):
                         [
                             "git",
                             "diff",
+                            "--quiet",
                             f"{commit}:{dfdir}/entrypoint.sh",
                             f"{official_gitcommit}:{dfdir}/entrypoint.sh",
                         ]
                     )
                     .decode()
                     .strip()
-                    != ""
+                    == 0
                 ):
                     diff = (
                         subprocess.check_output(