From 1fbf9e4d6d3d5957430cd4ce67fd0dc7b9d85968 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 26 Dec 2023 12:16:18 -0500 Subject: [PATCH 1/2] Fix #238, updating cFS_GroundSystem to use new versioning system. --- _version.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_version.py b/_version.py index fe5ba37..18986b1 100644 --- a/_version.py +++ b/_version.py @@ -18,7 +18,9 @@ # Development Build Macro Definitions _cFS_GrndSys_build_number = 43 -_cFS_GrndSys_build_baseline = "v3.0.0-rc4" +_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 From 0e32d425709d97139df05e4ce8028aa7f737f146 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 17 Jan 2024 15:43:49 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev2 --- CHANGELOG.md | 4 ++++ _version.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afc0567..78005ca 100644 --- 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 + ## Development Build: v3.0.0-rc4+dev43 - Add input so users can specify the parameter description - See diff --git a/_version.py b/_version.py index 18986b1..dda2ecf 100644 --- a/_version.py +++ b/_version.py @@ -17,7 +17,7 @@ # # Development Build Macro Definitions -_cFS_GrndSys_build_number = 43 +_cFS_GrndSys_build_number = 2 _cFS_GrndSys_build_baseline = "equuleus-rc1" _cFS_GrndSys_build_dev_cycle = "equuleus-rc2" _cFS_GrndSys_build_codename = "Equuleus"