Skip to content

Commit

Permalink
[#403] Updated CI workflow and makefile to avoid issue skipping build…
Browse files Browse the repository at this point in the history
…-fsw call;
  • Loading branch information
jlucas9 committed Nov 1, 2024
1 parent dfc443a commit 04bc16a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Build

on:
push:
pull_request:

jobs:
Expand All @@ -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

Expand All @@ -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
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 04bc16a

Please sign in to comment.