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

IC: equuleus-rc1+dev13 #779

Merged
merged 4 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A clear and concise description of what the contribution is.
**Testing performed**
Steps taken to test the contribution:
1. Build steps '...'
1. Execution steps '...'
2. Execution steps '...'

**Expected behavior changes**
A clear and concise description of how this contribution will change behavior and level of impact.
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-deploy-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
mv build/docs/${{ matrix.target }}/${{ matrix.target }}-warnings.log .

- name: Archive Document Build Logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}_doc_build_logs
path: |
Expand Down Expand Up @@ -165,9 +165,9 @@ jobs:

- name: Deploy to GitHub
if: ${{ inputs.deploy == true }}
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: deploy
SINGLE_COMMIT: true
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: deploy
single-commit: true
12 changes: 6 additions & 6 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4

- name: Display structure of downloaded files
run: ls -R
Expand All @@ -71,9 +71,9 @@ jobs:
run: mkdir deploy; mv */*.pdf deploy

- name: Deploy to GitHub
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: deploy
SINGLE_COMMIT: true
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: deploy
single-commit: true
2 changes: 1 addition & 1 deletion .github/workflows/build-run-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
echo "APP_UPPER=$(echo ${{ inputs.app-name }} | sed 's/[a-z]/\U&/g')" >> $GITHUB_ENV
echo "APP_LOWER=$(echo ${{ inputs.app-name }} | sed 's/[A-Z]/\L&/g')" >> $GITHUB_ENV

- name: Set up start string for verificaiton
- name: Set up start string for verification
run: |
if [[ "${{ inputs.startup-string }}" == '' ]]; then
echo "START_STRING=$APP_UPPER Initialized." >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
codeql:
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
with:
with:
component-path: cFS
make: make -j8
test: true
60 changes: 30 additions & 30 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@
So you'd like to contribute to cFS? Below are some guidelines for contributors to follow. Contributions come in all shapes and sizes. We appreciate your help with documentation, unit tests, framework code, continuous-integration, or simply reporting bugs and improvement ideas. We can't promise that we'll accept every suggestion or fix every bug in a timely manner but we'll respond to you as quickly as possible.

<!-- vscode-markdown-toc -->
* [Code of Conduct](#CodeofConduct)
* [Ways to Contribute](#WaystoContribute)
* [Discussions and Questions](#DiscussionsandQuestions)
* [Security Vulnerabilities](#SecurityVulnerabilities)
* [Bug Reports](#BugReports)
* [Before Reporting a Bug](#BeforeReportingaBug)
* [Reporting a Bug](#ReportingaBug)
* [What Happens to my Bug Report?](#WhatHappenstomyBugReport)
* [New Feature Requests](#NewFeatureRequests)
* [Before Requesting a New Feature](#BeforeRequestingaNewFeature)
* [Requesting a New Feature](#RequestingaNewFeature)
* [What Happens to my Feature Request?](#WhatHappenstomyFeatureRequest)
* [Issue Trackers for cFS Components](#IssueTrackersforcFSComponents)
* [cFS-Framework Components](#cFS-FrameworkComponents)
* [Lab Apps](#LabApps)
* [Tools](#Tools)
* [Other cFS Apps](#OthercFSApps)
* [Pull Requests](#PullRequests)
* [Contributor License Agreement (CLA)](#ContributorLicenseAgreementCLA)
* [Before starting your Pull Request](#BeforestartingyourPullRequest)
* [Creating a Pull Request](#CreatingaPullRequest)
* [What Happens to My Pull Request?](#WhatHappenstoMyPullRequest)
* [Writing High-Quality Code](#WritingHigh-QualityCode)
* [Using GitHub Actions Workflows](#UsingGitHubActionsWorkflows)
* [View Failed Workflows](#ViewFailedWorkflows)
* [View Workflow Results](#ViewWorkflowResults)
* [Configure Workflows](#ConfigureWorkflows)
* [cFS Workflows](#cFSWorkflows)
* [Git Commit Guidelines](#GitCommitGuidelines)
* [Working with git commits](#Workingwithgitcommits)
- [Code of Conduct](#code-of-conduct)
- [Ways to Contribute](#ways-to-contribute)
- [Discussions and Questions](#discussions-and-questions)
- [Security Vulnerabilities](#security-vulnerabilities)
- [Bug Reports](#bug-reports)
- [Before Reporting a Bug](#before-reporting-a-bug)
- [Reporting a Bug](#reporting-a-bug)
- [What Happens to my Bug Report?](#what-happens-to-my-bug-report)
- [New Feature Requests](#new-feature-requests)
- [Before Requesting a New Feature](#before-requesting-a-new-feature)
- [Requesting a New Feature](#requesting-a-new-feature)
- [What Happens to my Feature Request?](#what-happens-to-my-feature-request)
- [Issue Trackers for cFS Components](#issue-trackers-for-cfs-components)
- [cFS-Framework Components](#cfs-framework-components)
- [Lab Apps](#lab-apps)
- [Tools](#tools)
- [Other cFS Apps](#other-cfs-apps)
- [Pull Requests](#pull-requests)
- [Contributor License Agreement (CLA)](#contributor-license-agreement-cla)
- [Before starting your Pull Request](#before-starting-your-pull-request)
- [Creating a Pull Request](#creating-a-pull-request)
- [What Happens to My Pull Request?](#what-happens-to-my-pull-request)
- [Writing High-Quality Code](#writing-high-quality-code)
- [Using GitHub Actions Workflows](#using-github-actions-workflows)
- [View Failed Workflows](#view-failed-workflows)
- [View Workflow Results](#view-workflow-results)
- [Configure Workflows](#configure-workflows)
- [cFS Workflows](#cfs-workflows)
- [Git Commit Guidelines](#git-commit-guidelines)
- [Working with git commits](#working-with-git-commits)

<!-- vscode-markdown-toc-config
numbering=false
Expand Down
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 67 files
+2 −2 .github/workflows/code-coverage.yml
+17 −0 CHANGELOG.md
+2 −2 modules/cfe_testcase/src/tbl_content_mang_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+3 −3 modules/core_api/ut-stubs/src/cfe_sb_handlers.c
+1 −1 modules/core_private/config/default_cfe_core_private_internal_cfg.h
+5 −5 modules/core_private/ut-stubs/inc/ut_support.h
+9 −9 modules/core_private/ut-stubs/src/ut_support.c
+1 −1 modules/es/config/default_cfe_es_interface_cfg.h
+1 −1 modules/es/config/default_cfe_es_internal_cfg.h
+1 −1 modules/es/config/default_cfe_es_mission_cfg.h
+1 −1 modules/es/config/default_cfe_es_msg.h
+1 −1 modules/es/config/default_cfe_es_platform_cfg.h
+1 −1 modules/es/fsw/src/cfe_es_apps.c
+1 −1 modules/es/fsw/src/cfe_es_start.h
+6 −6 modules/es/fsw/src/cfe_es_task.c
+14 −5 modules/es/fsw/src/cfe_es_verify.h
+6 −6 modules/es/ut-coverage/es_UT.c
+1 −1 modules/evs/config/default_cfe_evs_interface_cfg.h
+1 −1 modules/evs/config/default_cfe_evs_internal_cfg.h
+1 −1 modules/evs/config/default_cfe_evs_mission_cfg.h
+1 −1 modules/evs/config/default_cfe_evs_msg.h
+1 −1 modules/evs/config/default_cfe_evs_platform_cfg.h
+8 −5 modules/evs/fsw/src/cfe_evs_task.h
+1 −0 modules/evs/fsw/src/cfe_evs_utils.c
+3 −3 modules/evs/ut-coverage/evs_UT.c
+1 −1 modules/fs/config/default_cfe_fs_mission_cfg.h
+1 −0 modules/fs/fsw/src/cfe_fs_api.c
+10 −0 modules/resourceid/fsw/inc/cfe_core_resourceid_basevalues.h
+1 −1 modules/sb/config/default_cfe_sb_fcncodes.h
+2 −2 modules/sb/config/default_cfe_sb_interface_cfg.h
+3 −4 modules/sb/config/default_cfe_sb_internal_cfg.h
+2 −2 modules/sb/config/default_cfe_sb_mission_cfg.h
+2 −2 modules/sb/config/default_cfe_sb_msg.h
+1 −1 modules/sb/config/default_cfe_sb_msgdefs.h
+1 −1 modules/sb/config/default_cfe_sb_msgids.h
+1 −1 modules/sb/config/default_cfe_sb_msgstruct.h
+2 −2 modules/sb/config/default_cfe_sb_platform_cfg.h
+1 −1 modules/sb/config/default_cfe_sb_topicids.h
+368 −968 modules/sb/fsw/src/cfe_sb_api.c
+0 −1 modules/sb/fsw/src/cfe_sb_buf.c
+1,057 −2 modules/sb/fsw/src/cfe_sb_priv.c
+517 −79 modules/sb/fsw/src/cfe_sb_priv.h
+1 −1 modules/sb/fsw/src/cfe_sb_task.c
+616 −405 modules/sb/ut-coverage/sb_UT.c
+4 −39 modules/sb/ut-coverage/sb_UT.h
+1 −1 modules/tbl/config/default_cfe_tbl_interface_cfg.h
+2 −2 modules/tbl/config/default_cfe_tbl_internal_cfg.h
+1 −1 modules/tbl/config/default_cfe_tbl_mission_cfg.h
+1 −1 modules/tbl/config/default_cfe_tbl_msg.h
+1 −1 modules/tbl/config/default_cfe_tbl_platform_cfg.h
+73 −113 modules/tbl/fsw/src/cfe_tbl_api.c
+164 −20 modules/tbl/fsw/src/cfe_tbl_internal.c
+99 −1 modules/tbl/fsw/src/cfe_tbl_internal.h
+133 −0 modules/tbl/fsw/src/cfe_tbl_resource.c
+449 −0 modules/tbl/fsw/src/cfe_tbl_resource.h
+49 −19 modules/tbl/fsw/src/cfe_tbl_task.h
+74 −114 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+3 −3 modules/tbl/fsw/src/cfe_tbl_transaction.c
+16 −1 modules/tbl/fsw/src/cfe_tbl_transaction.h
+407 −230 modules/tbl/ut-coverage/tbl_UT.c
+6 −0 modules/tbl/ut-coverage/tbl_UT.h
+1 −1 modules/time/config/default_cfe_time_interface_cfg.h
+1 −1 modules/time/config/default_cfe_time_internal_cfg.h
+1 −1 modules/time/config/default_cfe_time_mission_cfg.h
+1 −1 modules/time/config/default_cfe_time_msg.h
+1 −1 modules/time/config/default_cfe_time_platform_cfg.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 42 files
+5 −0 CHANGELOG.md
+109 −0 src/os/inc/osapi-clock.h
+15 −0 src/os/inc/osapi-common.h
+79 −2 src/os/inc/osapi-file.h
+94 −0 src/os/inc/osapi-select.h
+105 −1 src/os/inc/osapi-sockets.h
+1 −1 src/os/inc/osapi-version.h
+29 −44 src/os/portable/os-impl-bsd-select.c
+9 −7 src/os/portable/os-impl-bsd-sockets.c
+3 −3 src/os/portable/os-impl-no-sockets.c
+4 −4 src/os/portable/os-impl-posix-io.c
+0 −21 src/os/shared/inc/os-shared-common.h
+2 −2 src/os/shared/inc/os-shared-file.h
+3 −2 src/os/shared/inc/os-shared-select.h
+3 −3 src/os/shared/inc/os-shared-sockets.h
+80 −0 src/os/shared/src/osapi-clock.c
+17 −0 src/os/shared/src/osapi-common.c
+3 −1 src/os/shared/src/osapi-condvar.c
+2 −1 src/os/shared/src/osapi-errors.c
+26 −4 src/os/shared/src/osapi-file.c
+26 −4 src/os/shared/src/osapi-select.c
+40 −6 src/os/shared/src/osapi-sockets.c
+2 −0 src/tests/network-api-test/network-api-test.c
+52 −59 src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
+24 −20 src/unit-test-coverage/portable/src/coveragetest-bsd-sockets.c
+3 −3 src/unit-test-coverage/portable/src/coveragetest-no-sockets.c
+12 −12 src/unit-test-coverage/portable/src/coveragetest-posix-io.c
+27 −0 src/unit-test-coverage/shared/src/coveragetest-clock.c
+22 −0 src/unit-test-coverage/shared/src/coveragetest-common.c
+6 −6 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+2 −2 src/unit-test-coverage/ut-stubs/CMakeLists.txt
+52 −0 src/unit-test-coverage/ut-stubs/src/os-shared-clock-impl-handlers.c
+3 −1 src/unit-test-coverage/ut-stubs/src/os-shared-clock-impl-stubs.c
+4 −4 src/unit-test-coverage/ut-stubs/src/os-shared-file-impl-stubs.c
+4 −4 src/unit-test-coverage/ut-stubs/src/os-shared-select-impl-stubs.c
+6 −6 src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
+1 −0 src/ut-stubs/CMakeLists.txt
+32 −0 src/ut-stubs/osapi-clock-stubs.c
+72 −0 src/ut-stubs/osapi-common-handlers.c
+19 −0 src/ut-stubs/osapi-common-stubs.c
+38 −0 src/ut-stubs/osapi-file-stubs.c
+21 −0 src/ut-stubs/osapi-sockets-stubs.c
Loading