From 04bc16a9392217685358830584a2c002c47bf07e Mon Sep 17 00:00:00 2001
From: "Lucas, John P" <John.P.Lucas@nasa.gov>
Date: Fri, 1 Nov 2024 06:43:35 -0400
Subject: [PATCH] [nasa/nos3#403] Updated CI workflow and makefile to avoid
 issue skipping build-fsw call;

---
 .github/workflows/build.yml | 5 -----
 Makefile                    | 9 +--------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85de556f..3113033d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,6 @@
 name: Build
 
 on: 
-  push:
   pull_request:
 
 jobs:
@@ -21,8 +20,6 @@ jobs:
           run: make prep
         - name: config
           run: make config  
-        - name: build directory
-          run: mkdir ./fsw/build
         - name: build
           run: make build-fsw
 
@@ -42,7 +39,5 @@ jobs:
           run: make prep
         - name: config
           run: make config  
-        - name: build directory
-          run: mkdir ./sims/build
         - name: build
           run: make build-sim
diff --git a/Makefile b/Makefile
index 678a1183..3dbc81cc 100755
--- a/Makefile
+++ b/Makefile
@@ -52,19 +52,12 @@ build-cryptolib:
 	$(MAKE) --no-print-directory -C $(GSWBUILDDIR)
 
 build-fsw:
-
-
 ifeq ($(FLIGHT_SOFTWARE), fprime)
 	cd fsw/fprime/fprime-nos3 && fprime-util generate && fprime-util build
-	
-endif
-
-ifeq ($(FLIGHT_SOFTWARE), cfs)
+else
 	mkdir -p $(FSWBUILDDIR)
 	cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) ../cfe
 	$(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install
-else
-	pwd
 endif
 
 build-sim: