Merge branch 'v2.9.0' of https://github.com/codeproject/CodeProject.AI-Server into v2.9.0

Author: Chris Maunder

.github/workflows/package-ObjectDetectionYOLOv5-6.2.yml

@@ -5,7 +5,7 @@ on:
   #   branches:
   #     - main
   workflow_dispatch:  # Allows manual run
-    inputs: {}  # You can define inputs if needed
+    inputs: {}        # No inputs at this point
 
 jobs:
   package_and_upload:

devops/build/create_packages.sh

@@ -61,7 +61,7 @@ externalModulesDir="CodeProject.AI-Modules"
 serverDir="CodeProject.AI-Server"
 
 # Location of the utils script in the main CodeProject.AI server repo
-utilsScriptGitHubUrl='https://raw.githubusercontent.com/codeproject/CodeProject.AI-Server/refs/heads/main/src/scripts/utils.sh'
+utilsScriptGitHubUrl='https://raw.githubusercontent.com/codeproject/CodeProject.AI-Server/refs/heads/main/src/scripts'
 
 # Override some values via parameters ::::::::::::::::::::::::::::::::::::::::::
 
@@ -114,10 +114,6 @@ popd >/dev/null
 sdkPath="${rootDirPath}/${srcDirName}/${sdkDir}"
 utilsScriptsDirPath="${rootDirPath}/src/scripts"
 
-if [ "${githubAction}" == true ]; then
-    utilsScriptsDirPath="${utilsScriptGitHubUrl}"
-fi
-
 # Standard output may be used as a return value in the functions. Expose stream
 # 3 so we can do 'echo "Hello, World!" >&3' within these functions for debugging
 # without interfering with return values.
@@ -144,13 +140,15 @@ function correctLineEndings () {
     fi
 }
 
-if [ "${githubAction}" != true ]; then
+if [ "${githubAction}" == true ]; then
+    curl -sL ${utilsScriptGitHubUrl}/utils.sh -o utils.sh
+    source utils.sh
+    rm utils.sh
+else
     correctLineEndings ${utilsScriptsDirPath}/utils.sh
+    source ${utilsScriptsDirPath}/utils.sh
 fi
 
-# "platform" will be set by this script
-source ${utilsScriptsDirPath}/utils.sh
-
 # Helper method ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 function doModulePackage () {
@@ -259,7 +257,7 @@ success='true'
 
 if [ "${singleModule}" == true ]; then
 
-    packageModuleDirPath=$(pwd))
+    packageModuleDirPath=$(pwd)
     packageModuleDirName="$(basename $(pwd))"
     packageModuleId=$(getModuleIdFromModuleSettings "${packageModuleDirPath}/modulesettings.json")
 

modules/ObjectDetectionYOLOv5-6.2/package.bat

@@ -1,5 +1,5 @@
 @Echo off
-REM Module Packaging script. To be called from create_packages.bat
+REM Module Packaging script. To be called from ..\..\devops\build\create_packages.bat
 
 set moduleId=%~1
 set version=%~2

modules/ObjectDetectionYOLOv5-6.2/package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Module Packaging script. To be called from create_packages.sh
+# Module Packaging script. To be called by: bash ../../devops/build/create_packages.sh
 
 moduleId=$1
 version=$2

modules/ObjectDetectionYOLOv5Net/package.bat

@@ -1,5 +1,5 @@
 @Echo off
-REM Module Packaging script. To be called from create_packages.bat
+REM Module Packaging script. To be called from ..\..\devops\build\create_packages.bat
 
 REM The executable for this module is downloaded from S3. There are multiple forms
 REM of the executable, corresponding to different hardware, and the appropriate

modules/ObjectDetectionYOLOv5Net/package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Module Packaging script. To be called from create_packages.sh
+# Module Packaging script. To be called by: bash ../../devops/build/create_packages.sh
 
 # The executable for this module is downloaded from S3. There are multiple forms
 # of the executable, corresponding to different hardware, and the appropriate