Skip to content

Commit c0bf5b1

Browse files
committed
Fix #798, Update build and test workflows to include sample/lab apps + lib
1 parent 54556c6 commit c0bf5b1

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

.github/workflows/build-run-app.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ on:
1414
type: string
1515
required: false
1616
default: ''
17+
is_framework_app:
18+
description: Whether this is a framework app (TO/CI/SCH Lab, Sample App)
19+
type: boolean
20+
required: false
21+
default: false
1722

1823
# Force bash to apply pipefail option so pipeline failures aren't masked
1924
defaults:
@@ -75,12 +80,16 @@ jobs:
7580
7681
- name: Add To Build
7782
run: |
78-
sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
83+
if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
84+
sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
85+
fi
7986
8087
- name: Add To Startup
8188
run: |
82-
sed -i "1i CFE_APP, $APP_LOWER, ${APP_UPPER}_AppMain, $APP_UPPER, 80, 16384, 0x0, 0;" sample_defs/cpu1_cfe_es_startup.scr
83-
cat sample_defs/cpu1_cfe_es_startup.scr
89+
if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
90+
sed -i "1i CFE_APP, $APP_LOWER, ${APP_UPPER}_AppMain, $APP_UPPER, 80, 16384, 0x0, 0;" sample_defs/cpu1_cfe_es_startup.scr
91+
cat sample_defs/cpu1_cfe_es_startup.scr
92+
fi
8493
8594
- name: Make install
8695
run: make SIMULATION=native BUILDTYPE=release OMIT_DEPRECATED=true install

.github/workflows/unit-test-coverage.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
# Optional inputs
77
app-name:
8-
description: Application name, if different from repo name
8+
description: Application or library name, if different from repo name
99
type: string
1010
required: false
1111
default: ${{ github.event.repository.name }}
@@ -19,6 +19,11 @@ on:
1919
type: number
2020
required: false
2121
default: 0
22+
is_framework_app:
23+
description: Whether this is a framework/sample app or library
24+
type: boolean
25+
required: false
26+
default: false
2227

2328
# Force bash to apply pipefail option so pipeline failures aren't masked
2429
defaults:
@@ -75,15 +80,17 @@ jobs:
7580
7681
- name: Add Repo To Build
7782
run: |
78-
sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
83+
if [[ "${{ inputs.is_framework_app }}" == "false" ]]; then
84+
sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST $APP_LOWER)" sample_defs/targets.cmake
85+
fi
7986
8087
- name: Make Prep
8188
run: make SIMULATION=native ENABLE_UNIT_TESTS=true OMIT_DEPRECATED=true prep
8289

8390
- name: Build app build dependencies
8491
run: make -C build/tools/elf2cfetbl
8592

86-
- name: Build app target
93+
- name: Build app/library target
8794
run: |
8895
make -C build/native/default_cpu1/apps/$APP_LOWER
8996

0 commit comments

Comments
 (0)