Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A clear and concise description of what the contribution is.
**Testing performed**
Steps taken to test the contribution:
1. Build steps '...'
1. Execution steps '...'
2. Execution steps '...'

**Expected behavior changes**
A clear and concise description of how this contribution will change behavior and level of impact.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: "CodeQL Analysis"
on:
push:
pull_request:

jobs:
codeql:
name: Codeql
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
with:
with:
component-path: psp
make: 'make -C build/native/default_cpu1/psp'
6 changes: 3 additions & 3 deletions .github/workflows/icbundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ jobs:
done
changelog_entry="${changelog_entry}\n${see_entry}\n"
sed -ir "s|# Changelog|$changelog_entry|" CHANGELOG.md

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
- name: Commit and Push Updates to IC Branch
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/src/cfe_psp_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES
}
else
{
return_code = CFE_PSP_SUCCESS;
return_code = CFE_PSP_ERROR;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_cds_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_cds_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_exception_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_exception_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_id_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_id_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_memrange_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_memrange_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_timertick_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_timertick_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_version_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_version_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
2 changes: 1 addition & 1 deletion ut-stubs/src/cfe_psp_watchdog_api_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
************************************************************************/

/*
** File: ut_bsp_stubs.c
** File: cfe_psp_watchdog_api_handlers.c
**
** Purpose:
** Unit test stubs for BSP routines
Expand Down
Loading