diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index 1dc0949..d3c6290 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -2,12 +2,20 @@ name: "CodeQL Analysis" on: push: + branches: + - dev + - main pull_request: + types: + - opened + - reopened + - synchronize + workflow_dispatch: jobs: codeql: name: Codeql uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main - with: + with: component-path: tools/tblCRCTool make: 'make -C build/tools/tblCRCTool' diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index b9d1f11..441199a 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,8 +2,11 @@ name: Format Check # Run on all push and pull requests on: - push: pull_request: + types: + - opened + - reopened + - synchronize jobs: format-check: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f2a9aac..40c4cd9 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -3,7 +3,15 @@ name: Static Analysis # Run on all push and pull requests on: push: + branches: + - dev + - main pull_request: + types: + - opened + - reopened + - synchronize + workflow_dispatch: jobs: diff --git a/cfe_ts_crc.c b/cfe_ts_crc.c index 1a5e973..60ad02a 100644 --- a/cfe_ts_crc.c +++ b/cfe_ts_crc.c @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * diff --git a/cfe_ts_crc_version.h b/cfe_ts_crc_version.h index a247a2e..dd093e8 100644 --- a/cfe_ts_crc_version.h +++ b/cfe_ts_crc_version.h @@ -1,7 +1,7 @@ /************************************************************************ - * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” + * NASA Docket No. GSC-19,200-1, and identified as "cFS Draco" * - * Copyright (c) 2020 United States Government as represented by the + * Copyright (c) 2023 United States Government as represented by the * Administrator of the National Aeronautics and Space Administration. * All Rights Reserved. * @@ -29,22 +29,22 @@ /* * Development Build Macro Definitions */ -#define CFE_TS_CRC_BUILD_NUMBER 2 /*!< @brief Number of commits since baseline */ -#define CFE_TS_CRC_BUILD_BASELINE "equuleus-rc1" /*!< @brief Development Build: git tag that is the base for the current */ -#define CFE_TS_CRC_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ -#define CFE_TS_CRC_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ +#define CFE_TS_CRC_BUILD_NUMBER 0 /*!< @brief Number of commits since baseline */ +#define CFE_TS_CRC_BUILD_BASELINE "v7.0.0" /*!< @brief Development Build: git tag that is the base for the current */ +#define CFE_TS_CRC_BUILD_DEV_CYCLE "v7.0.0" /**< @brief Development: Release name for current development cycle */ +#define CFE_TS_CRC_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */ /* * Version Macros, see \ref cfsversions for definitions. */ -#define CFE_TS_CRC_MAJOR_VERSION 1 /*!< @brief Major version number */ -#define CFE_TS_CRC_MINOR_VERSION 1 /*!< @brief Minor version number */ +#define CFE_TS_CRC_MAJOR_VERSION 7 /*!< @brief Major version number */ +#define CFE_TS_CRC_MINOR_VERSION 0 /*!< @brief Minor version number */ #define CFE_TS_CRC_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/ /** * @brief Last official release. */ -#define CFE_TS_CRC_LAST_OFFICIAL "v3.1.0" +#define CFE_TS_CRC_LAST_OFFICIAL "v7.0.0" /*! * @brief Mission revision. @@ -53,7 +53,7 @@ * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for * cFS open-source development use (pending resolution of nasa/cFS#440) */ -#define CFE_TS_CRC_MISSION_REV 0xFF +#define CFE_TS_CRC_MISSION_REV 0x0 /* * Tools to construct version string