add input parameter

nasa · Jan 7, 2025 · 2c00f69 · 2c00f69
1 parent 1fef726
commit 2c00f69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml
@@ -14,6 +14,11 @@ on:
         type: string
         required: false
         default: ''
+      is_framework_app:
+        description: Whether this is a framework app (TO/CI/SCH Lab, Sample App)
+        type: boolean
+        required: false
+        default: false
 
 # Force bash to apply pipefail option so pipeline failures aren't masked
 defaults:
@@ -45,11 +50,9 @@ jobs:
     steps:
       - name: Set up environment variables
         # Apps typically use lowercase targets and uppercase names, this logic is fragile but works
-        # Mark the sample app/lib and lab apps as we don't need to add them to the build or startup file (they're already part of the bundle)
         run: |
           echo "APP_UPPER=$(echo ${{ inputs.app-name }} | sed 's/[a-z]/\U&/g')" >> $GITHUB_ENV
           echo "APP_LOWER=$(echo ${{ inputs.app-name }} | sed 's/[A-Z]/\L&/g')" >> $GITHUB_ENV
-          echo "IS_SAMPLE_OR_LAB=$(echo ${{ inputs.app-name }} | grep -iqE 'sample|lab' && echo true || echo false)" >> $GITHUB_ENV
 
       - name: Set up start string for verification
         run: |
@@ -77,13 +80,13 @@ jobs:
 
       - name: Add To Build
         run: |
-          if [[ "$IS_SAMPLE_OR_LAB" == "false" ]]; then
+          if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
             sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
           fi
 
       - name: Add To Startup
         run: |
-          if [[ "$IS_SAMPLE_OR_LAB" == "false" ]]; then
+          if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
             sed -i "1i CFE_APP, $APP_LOWER, ${APP_UPPER}_AppMain, $APP_UPPER, 80, 16384, 0x0, 0;" sample_defs/cpu1_cfe_es_startup.scr
             cat sample_defs/cpu1_cfe_es_startup.scr
           fi

diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml
@@ -19,6 +19,11 @@ on:
         type: number
         required: false
         default: 0
+      is_framework_app:
+        description: Whether this is a framework/sample app or library
+        type: boolean
+        required: false
+        default: false
 
 # Force bash to apply pipefail option so pipeline failures aren't masked
 defaults:
@@ -53,11 +58,9 @@ jobs:
 
       - name: Set up environment variables
         # Apps typically use lowercase targets and uppercase names, this logic is fragile but works
-        # Mark the sample app/lib and lab apps as we don't need to add them to the build or startup file (they're already part of the bundle)
         run: |
           echo "APP_UPPER=$(echo ${{ inputs.app-name }} | sed 's/[a-z]/\U&/g')" >> $GITHUB_ENV
           echo "APP_LOWER=$(echo ${{ inputs.app-name }} | sed 's/[A-Z]/\L&/g')" >> $GITHUB_ENV
-          echo "IS_SAMPLE_OR_LAB=$(echo ${{ inputs.app-name }} | grep -iqE 'sample|lab' && echo true || echo false)" >> $GITHUB_ENV
 
       - name: Checkout Bundle Main
         uses: actions/checkout@v4
@@ -77,7 +80,7 @@ jobs:
 
       - name: Add Repo To Build
         run: |
-          if [[ "$IS_SAMPLE_OR_LAB" == "false" ]]; then
+          if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
             sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
           fi