Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into nos3#254
Browse files Browse the repository at this point in the history
  • Loading branch information
jlucas9 committed Nov 20, 2024
2 parents 7fd285d + cf90de4 commit 9879ca5
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 5 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Build
on:
pull_request:

env:
CTEST_OUTPUT_ON_FAILURE: true

jobs:
fsw:
runs-on: ubuntu-latest
Expand All @@ -11,19 +14,23 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
- name: config
run: make config
- name: build
run: make build-fsw
run: make build-test
- name: test
run: make test-fsw

sim:
runs-on: ubuntu-latest
container:
image: ivvitc/nos3-64:20241010
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
- name: config
run: make config
Expand Down
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ build-sim:
cd $(SIMBUILDDIR) && cmake -DCMAKE_INSTALL_PREFIX=$(SIMBUILDDIR) $(CURDIR)/sims
$(MAKE) --no-print-directory -C $(SIMBUILDDIR) install

build-test:
ifeq ($(FLIGHT_SOFTWARE), fprime)
# TODO
else
mkdir -p $(FSWBUILDDIR)
cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe
$(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install
endif

checkout:
./scripts/checkout.sh

Expand Down Expand Up @@ -133,6 +142,9 @@ stop:
stop-gsw:
./scripts/gsw/stop_gsw.sh

test-fsw:
cd $(FSWBUILDDIR)/amd64-posix/default_cpu1 && ctest -O ctest.log

uninstall:
$(MAKE) clean
./scripts/cfg/uninstall.sh
2 changes: 1 addition & 1 deletion fsw/apps/sbn
Submodule sbn updated 1 files
+4 −4 CMakeLists.txt
2 changes: 1 addition & 1 deletion fsw/apps/sc
Submodule sc updated 1 files
+1 −1 CMakeLists.txt

0 comments on commit 9879ca5

Please sign in to comment.