Skip to content

Integration: post-v7.0.2-rc1 development #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jphickey merged 3 commits into from
Oct 26, 2026
Merged

Integration: post-v7.0.2-rc1 development #209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb5c9ae
Merge pull request #206 from nasa/dev
jphickey Oct 15, 2026
0cdb039
Part cFS#1175, Update version information
jphickey Oct 20, 2026
6d8ef33
Merge pull request #208 from jphickey/part-cfs1175-rc-version
jphickey Oct 20, 2026
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
15 changes: 7 additions & 8 deletions fsw/src/ci_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@

/* Development Build Macro Definitions */

#define CI_LAB_BUILD_NUMBER 1 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE "v7.0.1" /*!< Development Build: git tag that is the base for the current development */
#define CI_LAB_BUILD_DEV_CYCLE "v7.0.1" /**< @brief Development: Release name for current development cycle */
#define CI_LAB_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */
#define CI_LAB_BUILD_NUMBER 1 /*!< Development Build: Number of commits since baseline */
#define CI_LAB_BUILD_BASELINE "v7.0.2"
#define CI_LAB_BUILD_CODENAME "Draco" /**< @brief: Development: Code name for the current build */

/*
* Version Macros, see \ref cfsversions for definitions.
*/
#define CI_LAB_MAJOR_VERSION 7 /*!< @brief Major version number */
#define CI_LAB_MINOR_VERSION 0 /*!< @brief Minor version number */
#define CI_LAB_REVISION 1 /*!< @brief Revision version number. Value of 0 indicates a development version.*/
#define CI_LAB_MAJOR_VERSION 7
#define CI_LAB_MINOR_VERSION 0
#define CI_LAB_REVISION 2

/**
* @brief Last official release.
Expand All @@ -58,7 +57,7 @@
* @details Baseline git tag + Number of commits since baseline. @n
* See @ref cfsversions for format differences between development and release versions.
*/
#define CI_LAB_VERSION CI_LAB_BUILD_BASELINE "+dev" CI_LAB_STR(CI_LAB_BUILD_NUMBER)
#define CI_LAB_VERSION CI_LAB_BUILD_BASELINE "-rc" CI_LAB_STR(CI_LAB_BUILD_NUMBER) "-oss"

/**
* @brief Max Version String length.
Expand Down
Loading