Merge pull request #240 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev1
nasa · Jan 18, 2024 · 821a163 · 821a163
2 parents 0dd214d + 0e32d42
commit 821a163
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev2
+- updating cFS_GroundSystem to use new versioning system
+- See <https://github.com/nasa/cFS-GroundSystem/pull/239>
+
 ## Development Build: v3.0.0-rc4+dev43
 - Add input so users can specify the parameter description
 - See <https://github.com/nasa/cFS-GroundSystem/pull/206>

diff --git a/_version.py b/_version.py
@@ -17,8 +17,10 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 43
-_cFS_GrndSys_build_baseline = "v3.0.0-rc4"
+_cFS_GrndSys_build_number = 2
+_cFS_GrndSys_build_baseline = "equuleus-rc1"
+_cFS_GrndSys_build_dev_cycle = "equuleus-rc2"
+_cFS_GrndSys_build_codename = "Equuleus"
 
 # Version Number Definitions see doxygen docs for definitions
 _cFS_GrndSys_MAJOR = 2 # Major version number 
@@ -31,7 +33,7 @@
 # Reserved for mission use to denote patches/customizations as needed.
 # 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)
-_cFS_GrndSys_MISSIONREV = 255 
+_cFS_GrndSys_MISSIONREV = 255
 
 # Development Build format for __version__
 # Baseline git tag + Number of commits since baseline