fix: Update the release-check-tools to the latest changes.

apache · Oct 2, 2023 · 042a4a1 · 042a4a1
1 parent 63b4571
commit 042a4a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/tools/check_sigs.sh b/tools/check_sigs.sh
@@ -54,13 +54,23 @@ function checkFile() {
        echo "${FILE} SHA OK";
     fi
 
-    gpg --verify "${FILE}.asc"
-
 }
 
 for bundle in "${BUNDLE_DIR}"/*.zip
 do
     checkFile "${bundle}"
+
+    gpg --verify "${FILE}.asc"
+done
+
+for sbom in "${BUNDLE_DIR}"/*.json
+do
+    gpg --verify "${sbom}.asc"
+done
+
+for sbom in "${BUNDLE_DIR}"/*.xml
+do
+    gpg --verify "${sbom}.asc"
 done
 
 echo

diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
@@ -93,12 +93,17 @@ function mywget() {
   (set -x; curl -f -O "$1")
 }
 
-function getSignedBundle() {
+function getSignedAndHashedBundle() {
   mywget "${1}"
   mywget "${1}".asc
   mywget "${1}".sha512
 }
 
+function getSignedBundle() {
+  mywget "${1}"
+  mywget "${1}".asc
+}
+
 mkdir -p "${DST_BASE_DIR}"
 cd "${DST_BASE_DIR}"
 ABS_BASE_DIR=$(pwd)
@@ -114,9 +119,11 @@ fi
 
 mkdir -p "${DST_VER_DIR}"
 cd "${DST_VER_DIR}"
-mywget "${URL}"/README
+mywget "${URL}"/README.md
 mywget "${URL}"/RELEASE_NOTES
-getSignedBundle "${URL}"/apache-plc4x-"${VER}"-source-release.zip
+getSignedAndHashedBundle "${URL}"/apache-plc4x-"${VER}"-source-release.zip
+getSignedBundle "${URL}"/apache-plc4x-parent-"${VER}"-sbom.json
+getSignedBundle "${URL}"/apache-plc4x-parent-"${VER}"-sbom.xml
 
 echo
 echo Done Downloading to "${DST_BASE_DIR}"