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.

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

Fix #241, Add missing +dev to development version string #242

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jan 13, 2021

Describe the contribution
Fix #241, Version String not reported correctly

Increase size of Version element of CFE_PSP_VersionInfo_t to char[32] and rename as VersionString

Testing performed
Ran on local linux host, cFE EVS output now shows correct format for psp development version

EVS Port1 66/1/CFE_ES 2: cFS Versions: cfe v6.8.0-rc1+dev248, osal v5.1.0-rc1+dev184, psp v1.5.0-rc1+dev46. cFE chksm 43674

Expected behavior changes
Version report matches osal and cfe for development versions.

Increased structure

System(s) tested on
Ubuntu

Additional context
None

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@astrogeco

@astrogeco astrogeco force-pushed the fix-241-version-string-missing-+dev branch from 2ab262b to 4b167a5 Compare January 13, 2021 23:12
@astrogeco astrogeco requested a review from skliper January 13, 2021 23:12
@astrogeco astrogeco marked this pull request as ready for review January 13, 2021 23:12
Copy link
Contributor

@skliper skliper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically 4b167a5

@skliper skliper added this to the 1.6.0 milestone Jan 13, 2021
@skliper
Copy link
Contributor

skliper commented Feb 1, 2021

@astrogeco is this ready to review?

@astrogeco astrogeco marked this pull request as draft February 3, 2021 16:24
@astrogeco
Copy link
Contributor Author

Converted to draft since it needs a rebase. Added it to CCB:2021-02-03 agenda

@astrogeco astrogeco changed the base branch from main to integration-candidate February 12, 2021 23:19
@astrogeco astrogeco marked this pull request as ready for review February 12, 2021 23:19
@astrogeco astrogeco force-pushed the fix-241-version-string-missing-+dev branch from 4b167a5 to 84a02e8 Compare February 15, 2021 04:03
@astrogeco astrogeco force-pushed the fix-241-version-string-missing-+dev branch from 84a02e8 to 6a3a59c Compare February 15, 2021 04:07
@astrogeco astrogeco merged commit 814fe13 into nasa:integration-candidate Feb 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Version string not reported correctly
2 participants