Merge pull request #3213 from OWASP/fix-demos-matrix

Refactor build workflows for Android and iOS demos

Author: cpholguera

.github/workflows/build-android-demos.yml

@@ -37,7 +37,7 @@ jobs:
             echo "$changed_files"
 
             # Extract unique demo directories
-            matrix=$(echo "$changed_files" | grep -oE 'demos/android/[^/]*/MASTG-DEMO-[^/]+' | sort -u | sed 's/ /","/g')
+            matrix=$(echo "$changed_files" | grep -oE 'demos/android/[^/]*/MASTG-DEMO-[^/]+' | sort -u | head -c -1 | tr '\n' ' ' | sed 's/ /","/g')
 
             # If no changes, set empty matrix
             if [ -z "$matrix" ]; then
@@ -50,7 +50,7 @@ jobs:
             matrix=$(echo demos/android/*/MASTG-DEMO-* | sed 's/ /","/g')
             echo "matrix={\"demo\":[\"$matrix\"]}" >> $GITHUB_OUTPUT
           fi
-
+          echo "Print matrix: $matrix"
       - name: Print matrix
         run: echo "${{ steps.set-matrix.outputs.matrix }}"
 
@@ -152,12 +152,11 @@ jobs:
           )
 
           echo "Processing $demo"
-          cp -f "$demo/MastgTest.kt" MASTestApp-Android/app/src/main/java/org/owasp/mastestapp/MastgTest.kt 2>/dev/null \
-            && echo "Copied MastgTest.kt for $demo" \
-            || echo "No MastgTest.kt found for $demo"
-          cp -f "$demo/AndroidManifest.xml" MASTestApp-Android/app/src/main/AndroidManifest.xml 2>/dev/null \
-            && echo "Copied AndroidManifest.xml for $demo" \
-            || echo "No AndroidManifest.xml found for $demo"
+          for file in MastgTest.kt AndroidManifest.xml filepaths.xml network_security_config.xml backup_rules.xml data_extraction_rules.xml; do
+          cp -f "$demo/$file" "MASTestApp-Android/app/src/main/${file%/*}/$file" 2>/dev/null \
+            && echo "Copied $file for $demo" \
+            || echo "No $file found for $demo"
+          done
           
           echo "Building APK for $demo"
           cd MASTestApp-Android

.github/workflows/build-ios-demos.yml

@@ -36,7 +36,7 @@ jobs:
             echo "$changed_files"
 
             # Extract unique demo directories
-            matrix=$(echo "$changed_files" | grep -oE 'demos/ios/[^/]*/MASTG-DEMO-[^/]+' | sort -u | sed 's/ /","/g')
+            matrix=$(echo "$changed_files" | grep -oE 'demos/ios/[^/]*/MASTG-DEMO-[^/]+' | sort -u | head -c -1 | tr '\n' ' ' | sed 's/ /","/g')
 
             # If no changes, set empty matrix
             if [ -z "$matrix" ]; then
@@ -49,6 +49,7 @@ jobs:
             matrix=$(echo demos/ios/*/MASTG-DEMO-* | sed 's/ /","/g')
             echo "matrix={\"demo\":[\"$matrix\"]}" >> $GITHUB_OUTPUT
           fi
+          echo "Print matrix: $matrix"
 
   build:
     needs: generate-matrix