[nasa/nos3#407] CI Test 6

nasa-itc · Nov 14, 2024 · b24c8f5 · b24c8f5
1 parent a0ee71a
commit b24c8f5
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 48 deletions.
diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml
@@ -62,59 +62,59 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-          repository: nasa/cFS
+          repository: nasa-itc/sample
 
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          path: apps/${{  env.APP_LOWER  }}
+      # - name: Checkout Repo
+      #   uses: actions/checkout@v4
+      #   with:
+      #     path: apps/${{  env.APP_LOWER  }}
 
-      - name: Copy Files
-        run: |
-          cp ./cfe/cmake/Makefile.sample Makefile
-          cp -r ./cfe/cmake/sample_defs sample_defs
+      # - name: Copy Files
+      #   run: |
+      #     cp ./cfe/cmake/Makefile.sample Makefile
+      #     cp -r ./cfe/cmake/sample_defs sample_defs
 
       - name: Add To Build
         run: |
-          sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
+          sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST sample)" sample_defs/targets.cmake
 
-      - name: Add To Startup
-        run: |
-          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
+      # - name: Add To Startup
+      #   run: |
+      #     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
 
       - name: Make install
         run: make SIMULATION=native BUILDTYPE=release OMIT_DEPRECATED=true install
 
-      - name: Run cFS
-        working-directory: ./build/exe/cpu1
-        run: |
-          ./core-cpu1 > ../../../cFS_startup_cpu1.txt &
-          sleep 30
-          ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
-
-      - name: Archive results
-        uses: actions/upload-artifact@v4
-        with:
-          name: cFS_startup_log
-          path: cFS_startup_cpu1.txt
-
-      - name: Confirm startup string
-        run: |
-          if [[ -z $(grep "$START_STRING" cFS_startup_cpu1.txt) ]]; then
-            echo "Startup verification string not found in log: $START_STRING"
-            echo ""
-            echo "Possible related event messages:"
-            grep "/$APP_UPPER " cFS_startup_cpu1.txt
-            exit -1
-          fi
-
-      - name: Check for cFS Warnings
-        if: success() || failure()
-        run: |
-          if [[ -n $(grep -i "warn\|err\|fail" cFS_startup_cpu1.txt) ]]; then
-                  echo "cFS startup warn|err|fail:"
-                  echo ""
-                  grep -i 'warn\|err\|fail' cFS_startup_cpu1.txt
-                  exit -1
-          fi
+      # - name: Run cFS
+      #   working-directory: ./build/exe/cpu1
+      #   run: |
+      #     ./core-cpu1 > ../../../cFS_startup_cpu1.txt &
+      #     sleep 30
+      #     ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
+
+      # - name: Archive results
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: cFS_startup_log
+      #     path: cFS_startup_cpu1.txt
+
+      # - name: Confirm startup string
+      #   run: |
+      #     if [[ -z $(grep "$START_STRING" cFS_startup_cpu1.txt) ]]; then
+      #       echo "Startup verification string not found in log: $START_STRING"
+      #       echo ""
+      #       echo "Possible related event messages:"
+      #       grep "/$APP_UPPER " cFS_startup_cpu1.txt
+      #       exit -1
+      #     fi
+
+      # - name: Check for cFS Warnings
+      #   if: success() || failure()
+      #   run: |
+      #     if [[ -n $(grep -i "warn\|err\|fail" cFS_startup_cpu1.txt) ]]; then
+      #             echo "cFS startup warn|err|fail:"
+      #             echo ""
+      #             grep -i 'warn\|err\|fail' cFS_startup_cpu1.txt
+      #             exit -1
+      #     fi
diff --git a/Makefile b/Makefile
@@ -122,8 +122,7 @@ install:
 	$(MAKE) --no-print-directory -C "$(O)" DESTDIR="." mission-install
 
 prep $(O)/.prep:
-	mkdir -p "$(O)"
-	(cmake $(PREP_OPTS))
+	(cmake $(PREP_OPTS) ./fsw/cfs)
 	echo "$(PREP_OPTS)" > "$(O)/.prep"
 
 clean: