Skip to content
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

Jump to bottom

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev1 #240

Merged
merged 3 commits into from
Jan 18, 2024
Merged

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev1 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fbf9e4
Fix #238, updating cFS_GroundSystem to use new versioning system.
dzbaker Dec 26, 2023
c214cdc
Merge pull request #239 from dzbaker:fix-238
dzbaker Jan 17, 2024
0e32d42
Updating documentation and version numbers for equuleus-rc1+dev2
dzbaker Jan 17, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 5 additions & 3 deletions _version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading