From b4da38aef97ba7c1b83ebca39538d6fb2017cb9f Mon Sep 17 00:00:00 2001 From: Ariel Adams Date: Thu, 8 Apr 2021 10:47:48 -0500 Subject: [PATCH 1/2] Fix #231, Rename Getting Started in Contributing.md --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b06b69cc..993493594 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ So you'd like to contribute to cFS? Below are some guidelines for contributors t [Writing High-Quality Code](#writing-high-quality-code) -[Getting Started](#getting-started) +[Quick Links to Submodules](#quick-links-to-submodules) ## Code of Conduct This project and everyone participating in it is governed by the [cFS Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to the project team at cfs-program@lists.nasa.gov. @@ -28,7 +28,7 @@ For questions or help, submit a GitHub isssue or email us at cfs-program@lists.n ### Report Bugs #### Before Submitting a Bug -1. Perform a cursory search to see if the bug has already been reported. If it has and the issue is still open, add a comment to the existing issue instead of opening a new one. +1. Perform a cursory search to see if the bug has already been reported. For issues in each submodule, visit the section [Quick Links to Submodules](#quick-links-to-submodules). If a bug has been reported and the issue is still open, add a comment to the existing issue instead of opening a new one. 2. Determine which repository the bug should be reported in. If you are not sure, place the [issue in NASA/cFS](https://github.com/nasa/cFS/issues/new?assignees=&labels=&template=bug_report.md&title=). #### Reporting a Bug @@ -49,7 +49,7 @@ If you run into a bug with the project: ### Feature Requests #### Before Submitting a Feature Request 1. Review the cFS README.md file to see if your feature is in the major future work. -2. Perform a cursory search to see if the feature has already been requested. If it has and the issue is still open, add a comment to the existing issue instead of opening a new one. +2. Perform a cursory search to see if the feature has already been requested. For issues in each submodule, visit the section [Quick Links to Submodules](#quick-links-to-submodules). If a feature request has been reported and the issue is still open, add a comment to the existing issue instead of opening a new one. 3. Determine which repository the feature should be reported in. If you are not sure, [place the issue in NASA/cFS](https://github.com/nasa/cFS/issues/new?assignees=&labels=&template=feature_request.md&title=). #### Submitting a Feature Request @@ -113,12 +113,12 @@ Follow GitHub's fork-branch-pull request pattern. - Push code changes to the appropriate forked repository. - Go to the Actions tab and enable GitHub Actions Workflow. The CodeQL Analyis and Static Analysis will be triggered for all pushed code. - Review these workflows for any warnings or errors. - - Once successful, create a pull request. + - Once successful, create a pull request. For more information on our GitHub Action Workflows, view our [Security Policy](https://github.com/nasa/cFS/security/policy). -## Getting Started -Before you begin, search through the open issues in each submodule to ensure that your ticket is relevant, not redundant, nor in conflict with other tickets: +## Quick Links to Submodules +Before you [report bugs](#report-bugs) or submit [feature requests](#feature-requests), search through the open issues in each submodule to ensure that your ticket is relevant, not redundant, nor in conflict with other tickets: * [cFS Bundle Issues](https://github.com/nasa/cfs/issues) * [cFE Issues](https://github.com/nasa/cfe/issues) * [OSAL Issues](https://github.com/nasa/osal/issues) From 7e1e34ca51e8f60e8cc845595213881842341ab6 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 27 Apr 2021 21:14:26 -0400 Subject: [PATCH 2/2] IC:2021-04-27, cfe, osal, and sample_lib Combines: nasa/cFE#1431 nasa/osal#975 nasa/sample_lib#61 Includes: nasa/cfe#1379, memory pool pointer type nasa/cfe#1289, ES child task functional test nasa/cfe#1289, typo in macro name nasa/cfe#1286, Remove broken BUILDDIR reference nasa/cfe#1305, remove option for "osal_compatible" nasa/cfe#1374, CFE_SUCCESS constant type nasa/cfe#1316, Remove Unused Error Codes nasa/cfe#1370, better warning about malformed startup line nasa/cfe#1373, check status of call to `CFE_ES_CDS_CachePreload` nasa/cfe#1384, update documentation for `CFE_ES_DeleteCDS` nasa/cfe#1385, exception logic when app/task is not found nasa/cfe#1372, error if alignment size not a power of two nasa/cfe#1368, remove unneeded CFE_ES_SYSLOG_APPEND macro nasa/cfe#1382, improve documentation for resourceID patterns nasa/cfe#1371, assert `CFE_RESOURCEID_MAX` is a bitmask nasa/osal#972, update documentation for read/write nasa/osal#966, add "handler" feature to utassert stub API nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification nasa/osal#971, socket accept using incorrect record nasa/osal#959, move async console option nasa/sample_lib#60, replace direct ref to ArgPtr with macro --- apps/sample_lib | 2 +- cfe | 2 +- osal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/sample_lib b/apps/sample_lib index 1b9eea342..12c82b585 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 1b9eea342bba38b3d81de1ee9d966acf5854130d +Subproject commit 12c82b58595fe92dad2f110bf1996dc6832c52b9 diff --git a/cfe b/cfe index 73c338d54..c8b5e00bb 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 73c338d544f85cb0c1a97b743d3ae9f7a35039b5 +Subproject commit c8b5e00bb722d8f59787ae8f82634feba5d39f60 diff --git a/osal b/osal index afb5f7ba3..a06166692 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit afb5f7ba3ea48823e44490ce4258aa92a073087f +Subproject commit a061666924644a7d23b17d3d060dc9e704913447