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

cFS Bundle Integration Candidate: 2021-02-02 #182

Merged
merged 5 commits into from
Feb 16, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jan 27, 2021

Describe the contribution
Combines

nasa/cFE#1150
nasa/osal#774
nasa/PSP#250
nasa/to_lab#84
nasa/tblCRCTool#35

Testing performed
See https://github.com/nasa/cFS/pull/182/checks

Expected behavior changes
See submodule PRs

System(s) tested on
Ubuntu 18.04

Additional context
None

Code contibutions
The cFS repository is provided to bundle the cFS Framework. It is utilized for bundling submodules, continuous integration testing, and version management and does not contain any software. Code contributions should be directed to the appropriate submodule.

Contributor Info - All information REQUIRED for consideration of pull request
@martintc
@astrogeco
@jphickey
@zanzaben
@skliper

@astrogeco astrogeco force-pushed the integration-candidate branch 2 times, most recently from 0ce77c5 to ec41281 Compare January 27, 2021 22:52
@jphickey
Copy link
Contributor

jphickey commented Feb 8, 2021

After my fix to add the ref (defgroup) doxygen is still complaining about this one:

/home/runner/work/cFS/cFS/cfe/fsw/cfe-core/src/inc/cfe_resourceid_api.h:205: warning: unable to resolve reference to `CFEESResourceIDBase' for \ref command

Even though the ref is here:
https://github.com/nasa/cFE/blob/4fa37865608f2b2b6f62a8fe09bdc3c232c8b800/fsw/cfe-core/src/inc/private/cfe_core_resourceid_basevalues.h#L39

The only thing I can think of is that perhaps the "private" subdir is not included in userguide build?

If so - then this warning will probably be fixed by upcoming refactor in nasa/cFE#972

Fix #178, Remove debug build in CodeQL
@astrogeco astrogeco force-pushed the integration-candidate branch from 3ad1759 to b24c5fe Compare February 16, 2021 17:34
Fix #170, Deploy documentation from GitHub action
@astrogeco astrogeco merged commit 5ca472a into main Feb 16, 2021
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
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.

4 participants