Merge branch 'dev' into refactor-to-align-with-modifications-in-axsharp

Inxton · Feb 17, 2025 · c20f675 · c20f675
2 parents 9544a42 + 91df051
commit c20f675
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/single_app_run.yml b/.github/workflows/single_app_run.yml
@@ -1,10 +1,10 @@
-name: nightly
+name: single_app_run
 
 on:
   workflow_dispatch:
     inputs:
       folder:
-        description: "Select library folder (abstractions, components.abb.robotics, components.abstractions)"
+        description: "Select library folder"
         required: true
         default: "template.axolibrary"
         type: choice
@@ -36,25 +36,27 @@ on:
           - template.axolibrary
           - timers
           - utils
+
 jobs:
   app-run-manual-with-selected-folder:
     runs-on: [self-hosted, Windows, X64, L3, AX, APP]  
     steps:
     - name: Get Branch Name
       shell: pwsh
       run: |
-          if ($env:GITHUB_REF -like "refs/pull/*") {
-            $BRANCH_NAME = "${{ github.event.pull_request.head.ref }}"
-          } else {
-            $BRANCH_NAME = $env:GITHUB_REF -replace 'refs/heads/', ''
-          }
-          Write-Host "Triggered on branch: $BRANCH_NAME"
-          "BRANCH_NAME=$BRANCH_NAME" | Out-File -FilePath $env:GITHUB_ENV -Append
+        if ($env:GITHUB_REF -like "refs/pull/*") {
+          $BRANCH_NAME = "${{ github.event.pull_request.head.ref }}"
+        } else {
+          $BRANCH_NAME = $env:GITHUB_REF -replace 'refs/heads/', ''
+        }
+        Write-Host "Triggered on branch: $BRANCH_NAME"
+        "BRANCH_NAME=$BRANCH_NAME" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-    - name: Print Inputs
+    - name: Print and store library folder
+      shell: pwsh
       run: |
-        $APP_FOLDER=${{ github.event.inputs.folder }}
-        echo "Selected folder: $APP_FOLDER"
+        $APP_FOLDER = "${{ inputs.folder }}"
+        Write-Host "Selected folder: $APP_FOLDER"
         "APP_FOLDER=$APP_FOLDER" | Out-File -FilePath $env:GITHUB_ENV -Append
 
     - name: Checkout

diff --git a/cake/Program.cs b/cake/Program.cs
@@ -371,15 +371,17 @@ public override void Run(BuildContext context)
                             // Build and start HMI
                             AppsRunTaskHelpers.BuildAndStartHmi(context, appFile, appName, logFilePath, ref summaryResult);
 
-                            if (!summaryResult)
-                            {
-                                context.Log.Error($"App run failed for some of the applications.");
-                                context.Log.Error($"Good luck with finding out the reason :-).");
-                                Environment.Exit(1);
-                            }
+
                         }
                     }
                 }
+
+                if (!summaryResult)
+                {
+                    context.Log.Error($"App run failed for some of the applications.");
+                    context.Log.Error($"Good luck with finding out the reason :-).");
+                    Environment.Exit(1);
+                }
             }
             else
             {