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: Caelum-rc4+dev12 #523

Merged
merged 9 commits into from
Jul 8, 2022

Conversation

dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Jul 8, 2022

Checklist (Please check before submitting)

Describe the contribution

Combines:

osal v6.0.0-rc4+dev93
ci_lab v2.5.0-rc4+dev22
to_lab v2.5.0-rc4+dev24
sch_lab v2.5.0-rc4+dev31

Includes:

Update Minimum CMake Version

Testing performed
Bundle Checks https://github.com/nasa/cFS/pull/523/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 18.04

Additional context
None

Code contributions
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
@skliper
@ArielSAdamsNASA
@jphickey
@dzbaker

ArielSAdams and others added 9 commits June 16, 2022 12:33
The tools CMakeLists.txt file just adds the subdirectories, it has no logic.
The old version being referenced here triggers a deprecation warning, so
just remove it.
…ql-results

Fix #509, Rename Tool for CodeQL Results
Fix #520, remove cmake_minimum_required in tools
*Combines:*

osal v6.0.0-rc4+dev93
ci_lab v2.5.0-rc4+dev22
to_lab v2.5.0-rc4+dev24
sch_lab v2.5.0-rc4+dev31

**Includes:**

- nasa/osal#1265, Set OSAL Loader unit test number of modules to OSAL_CONFIG_MAX_MODULES

*Update Minimum CMake Version*
- nasa/osal#1267, Update minimum required cmake version
- nasa/ci_lab#113, update cmake_minimum_required
- nasa/sch_lab#117, update cmake_minimum_required

Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Ariel Adams    <arielsadamsnasa@users.noreply.github.com>
Co-authored by: Joseph Hickey  <jphickey@users.noreply.github.com>
@dzbaker dzbaker changed the title Integration candidate cFS Bundle Integration candidate: Caelum-rc4+dev12 Jul 8, 2022
dzbaker added a commit to nasa/osal that referenced this pull request Jul 8, 2022
- update cmake_minimum_required
- OSAL loader unit test builds hardcoded 32 modules, test fails if more modules are supported
- See <nasa/cFS#523>
dzbaker added a commit to nasa/ci_lab that referenced this pull request Jul 8, 2022
- update cmake_minimum_required
- see <nasa/cFS#523>
dzbaker added a commit to nasa/sch_lab that referenced this pull request Jul 8, 2022
- update cmake_minimum_required
- See <nasa/cFS#523>
dzbaker added a commit to nasa/to_lab that referenced this pull request Jul 8, 2022
- update cmake_minimum_required
- See <nasa/cFS#523>
@dzbaker dzbaker merged commit bbd81ec into main Jul 8, 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