From c0dec3a3ecca6416f523dde53d0bdea7d907d13b Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 2 Feb 2026 12:22:07 -0500 Subject: [PATCH 1/3] Whitespace and formatting changes (applied via clang-format) --- fsw/src/sample_lib.c | 8 ++++++-- fsw/src/sample_lib_version.h | 19 ++++++++++--------- .../coveragetest/coveragetest_sample_lib.c | 10 ++++++---- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/fsw/src/sample_lib.c b/fsw/src/sample_lib.c index 5275f65..f44e975 100644 --- a/fsw/src/sample_lib.c +++ b/fsw/src/sample_lib.c @@ -65,8 +65,12 @@ int32 SAMPLE_LIB_Init(void) /* ensure termination */ SAMPLE_LIB_Buffer[sizeof(SAMPLE_LIB_Buffer) - 1] = 0; - CFE_Config_GetVersionString(VersionString, SAMPLE_LIB_CFG_MAX_VERSION_STR_LEN, "Sample Lib", - SAMPLE_LIB_VERSION, SAMPLE_LIB_BUILD_CODENAME, SAMPLE_LIB_LAST_OFFICIAL); + CFE_Config_GetVersionString(VersionString, + SAMPLE_LIB_CFG_MAX_VERSION_STR_LEN, + "Sample Lib", + SAMPLE_LIB_VERSION, + SAMPLE_LIB_BUILD_CODENAME, + SAMPLE_LIB_LAST_OFFICIAL); OS_printf("SAMPLE Lib Initialized.%s\n", VersionString); diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h index d0177e7..660fe16 100644 --- a/fsw/src/sample_lib_version.h +++ b/fsw/src/sample_lib_version.h @@ -26,17 +26,18 @@ /* Development Build Macro Definitions */ -#define SAMPLE_LIB_BUILD_NUMBER 0 /*!< Development Build: Number of commits since baseline */ -#define SAMPLE_LIB_BUILD_BASELINE "v7.0.0" /*!< Development Build: git tag that is the base for the current development */ -#define SAMPLE_LIB_BUILD_DEV_CYCLE "v7.0.0" /**< @brief Development: Release name for current development cycle */ -#define SAMPLE_LIB_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */ +#define SAMPLE_LIB_BUILD_NUMBER 0 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_LIB_BUILD_BASELINE \ + "v7.0.0" /*!< Development Build: git tag that is the base for the current development */ +#define SAMPLE_LIB_BUILD_DEV_CYCLE "v7.0.0" /**< @brief Development: Release name for current development cycle */ +#define SAMPLE_LIB_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */ /* * Version Macros, see \ref cfsversions for definitions. */ -#define SAMPLE_LIB_MAJOR_VERSION 7 /*!< @brief Major version number */ -#define SAMPLE_LIB_MINOR_VERSION 0 /*!< @brief Minor version number */ -#define SAMPLE_LIB_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/ +#define SAMPLE_LIB_MAJOR_VERSION 7 /*!< @brief Major version number */ +#define SAMPLE_LIB_MINOR_VERSION 0 /*!< @brief Minor version number */ +#define SAMPLE_LIB_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/ /** * @brief Last official release. @@ -71,9 +72,9 @@ /** * @brief Max Version String length. - * + * * Maximum length that a sample_lib version string can be. - * + * */ #define SAMPLE_LIB_CFG_MAX_VERSION_STR_LEN 256 diff --git a/unit-test/coveragetest/coveragetest_sample_lib.c b/unit-test/coveragetest/coveragetest_sample_lib.c index 9a9f7c3..dcae281 100644 --- a/unit-test/coveragetest/coveragetest_sample_lib.c +++ b/unit-test/coveragetest/coveragetest_sample_lib.c @@ -63,11 +63,11 @@ typedef struct * A local helper (hook) function for the OS_printf stub provided by OSAL. * This confirms internal content of the format string and arguments. */ -static int32 UT_printf_hook(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context, - va_list va) +static int32 +UT_printf_hook(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context, va_list va) { SAMPLE_LIB_Function_TestState_t *State = UserObj; - const char * string = UT_Hook_GetArgValueByName(Context, "string", const char *); + const char *string = UT_Hook_GetArgValueByName(Context, "string", const char *); /* * The OS_printf() stub passes format string as the argument @@ -173,7 +173,9 @@ void Sample_UT_Setup(void) /* * Teardown function after every test */ -void Sample_UT_TearDown(void) {} +void Sample_UT_TearDown(void) +{ +} /* * Register the test cases to execute with the unit test tool From 50dc04bc9429589c10e50844dae58bf43c137b1b Mon Sep 17 00:00:00 2001 From: Adams Date: Wed, 8 Apr 2026 14:17:04 -0500 Subject: [PATCH 2/3] Part cFS/workflows#177, Update Existing Workflows with Internal Logic --- .github/workflows/format-check.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 441199a..243ad40 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,13 +2,18 @@ name: Format Check # Run on all push and pull requests on: + push: + branches: + - dev + - main pull_request: types: - opened - reopened - synchronize + workflow_dispatch: jobs: format-check: name: Run format check - uses: nasa/cFS/.github/workflows/format-check.yml@main + uses: nasa/cFS/.github/workflows/format-check.yml@dev \ No newline at end of file From 953829e2bd23fa3a72c02d7065825558a487c797 Mon Sep 17 00:00:00 2001 From: Walker Date: Wed, 6 May 2026 15:30:50 -0500 Subject: [PATCH 3/3] Part cFS/workflows#136, Update CodeQL Logic --- .github/workflows/codeql-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index 5f09f53..2cc4165 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -15,7 +15,8 @@ on: jobs: codeql: name: Codeql - uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main + uses: nasa/cFS/.github/workflows/codeql-reusable.yml@dev with: - component-path: libs/sample_lib + component-path: apps/sample_lib + prep: 'make prep; make -C build/tools/elf2cfetbl' make: 'make -C build/native/default_cpu1/apps/sample_lib'