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
10 changes: 9 additions & 1 deletion .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
5 changes: 4 additions & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions cfe_ts_crc.c
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
20 changes: 10 additions & 10 deletions cfe_ts_crc_version.h
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down
Loading