Skip to content

Commit 6c5f135

Browse files
author
John P. Lucas
authored
Merge pull request #770 from nasa/dev
Release 1.7.3
2 parents 16b5f02 + 5226cb2 commit 6c5f135

File tree

304 files changed

+13359
-1348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+13359
-1348
lines changed

.clang-format

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: Align
5+
AlignConsecutiveAssignments: true
6+
AlignConsecutiveDeclarations: true
7+
AlignConsecutiveMacros: true
8+
AlignEscapedNewlines: Left
9+
AlignOperands: true
10+
AlignTrailingComments: true
11+
AllowAllParametersOfDeclarationOnNextLine: true
12+
AllowShortBlocksOnASingleLine: Empty
13+
AllowShortCaseLabelsOnASingleLine: false
14+
AllowShortFunctionsOnASingleLine: Empty
15+
AllowShortIfStatementsOnASingleLine: false
16+
AllowShortLoopsOnASingleLine: false
17+
AlwaysBreakAfterReturnType: None
18+
AlwaysBreakBeforeMultilineStrings: false
19+
BinPackArguments: true
20+
BinPackParameters: true
21+
BreakBeforeBinaryOperators: None
22+
BreakBeforeBraces: Allman
23+
BreakBeforeTernaryOperators: true
24+
BreakStringLiterals: true
25+
ColumnLimit: 120
26+
CommentPragmas: ''
27+
ContinuationIndentWidth: 4
28+
Cpp11BracedListStyle: true
29+
DerivePointerAlignment: false
30+
DisableFormat: false
31+
ExperimentalAutoDetectBinPacking: false
32+
ForEachMacros: []
33+
IncludeBlocks: Preserve
34+
IncludeCategories: []
35+
IncludeIsMainRegex: '$'
36+
IndentCaseLabels: true
37+
IndentPPDirectives: None
38+
IndentWidth: 4
39+
KeepEmptyLinesAtTheStartOfBlocks: true
40+
MacroBlockBegin: ''
41+
MacroBlockEnd: ''
42+
MaxEmptyLinesToKeep: 1
43+
PenaltyBreakAssignment: 2
44+
PenaltyBreakBeforeFirstCallParameter: 19
45+
PenaltyBreakComment: 300
46+
PenaltyBreakFirstLessLess: 120
47+
PenaltyBreakString: 1000
48+
PenaltyExcessCharacter: 1000000
49+
PenaltyReturnTypeOnItsOwnLine: 60
50+
PointerAlignment: Right
51+
ReflowComments: true
52+
SortIncludes: false
53+
SpaceAfterCStyleCast: false
54+
SpaceBeforeAssignmentOperators: true
55+
SpaceBeforeParens: ControlStatements
56+
SpaceInEmptyParentheses: false
57+
SpaceBeforeCpp11BracedList: true
58+
SpacesBeforeTrailingComments: 1
59+
SpacesInCStyleCastParentheses: false
60+
SpacesInParentheses: false
61+
SpacesInSquareBrackets: false
62+
Standard: c++11
63+
TabWidth: 8
64+
UseTab: Never
Lines changed: 20 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,33 @@
1-
name: "🐛 Bug Report"
1+
name: "Bug Report"
22
description: Create a new ticket for a bug.
3-
title: "🐛 [BUG] - <title>"
43
labels: [
5-
"bug"
4+
"Bug"
65
]
76
body:
87
- type: textarea
98
id: description
109
attributes:
1110
label: "Description"
12-
description: Please enter an explicit description of your issue
13-
placeholder: Short and explicit description of your incident...
14-
validations:
15-
required: true
16-
- type: input
17-
id: reprod-url
18-
attributes:
19-
label: "Branch Name"
20-
description: Please enter the branch / link to fork
21-
placeholder: ex. 'dev' or https://github.com/USERNAME/REPO-NAME
22-
validations:
23-
required: false
24-
- type: textarea
25-
id: reprod
26-
attributes:
27-
label: "Reproduction steps"
28-
description: Please enter an explicit description of your issue
2911
value: |
30-
1. Go to '...'
31-
2. Click on '....'
32-
3. Scroll down to '....'
33-
4. See error
34-
render: bash
12+
Define the problem.
13+
14+
Capture the setup:
15+
* Which branch and git hash used
16+
* Any changes in configuration
17+
18+
Steps to recreate:
19+
* ...
20+
21+
Add logs or screenshots as desired.
22+
3523
validations:
3624
required: true
37-
- type: textarea
38-
id: screenshot
39-
attributes:
40-
label: "Screenshots"
41-
description: If applicable, add screenshots to help explain your problem.
42-
value: |
43-
![DESCRIPTION](LINK.png)
44-
render: bash
45-
validations:
46-
required: false
47-
- type: textarea
48-
id: logs
49-
attributes:
50-
label: "Logs"
51-
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
52-
render: bash
53-
validations:
54-
required: false
25+
5526
- type: dropdown
5627
id: os
5728
attributes:
5829
label: "OS"
59-
description: What is the impacted environment ?
30+
description: What is the impacted environment?
6031
multiple: true
6132
options:
6233
- Windows (Direct Clone)
@@ -66,4 +37,8 @@ body:
6637
- Mac (Direct Clone)
6738
- Mac (Shared Folders)
6839
validations:
69-
required: true
40+
required: false
41+
42+
- type: markdown
43+
attributes:
44+
value: "Optional: Please apply any labels or types as necessary - leave blank for unknown."
Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
name: "💡 Feature Request"
2-
description: Create a new ticket for a new feature request
3-
title: "💡 [REQUEST] - <title>"
1+
name: "Feature Request"
2+
description: Create a new ticket for a new request
43
labels: [
5-
"question"
4+
"NewIssue"
65
]
76
body:
8-
- type: textarea
9-
id: summary
7+
- type: markdown
108
attributes:
11-
label: "Summary"
12-
description: Provide a brief explanation of the feature
13-
placeholder: Describe in a few lines your feature request
14-
validations:
15-
required: true
9+
value: "Please add a short descriptive title to feature request."
1610
- type: textarea
17-
id: basic_example
11+
id: description
1812
attributes:
19-
label: "Use Case"
20-
description: Indicate here some basic examples of your feature.
21-
placeholder: A few specific words about your feature request.
13+
label: "Description"
14+
value: |
15+
Provide details related to the new feature.
16+
17+
render: bash
2218
validations:
2319
required: true
20+
- type: markdown
21+
attributes:
22+
value: "Optional: Please apply any labels or types as necessary - leave blank for unknown."

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Summary of PR goals.
2+
3+
How to test?
4+
* ...
5+
6+
Submodule PRs and actions prior to closing this:
7+
* ...
8+
9+
Closes #issue.

.github/workflows/build.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ on:
66
env:
77
CTEST_OUTPUT_ON_FAILURE: true
88

9+
permissions:
10+
contents: write
11+
id-token: write
12+
913
jobs:
1014
fsw:
1115
runs-on: ubuntu-latest
1216
container:
13-
image: ivvitc/nos3-64:20250124
17+
image: ivvitc/nos3-64:20250514
1418
steps:
1519
- uses: actions/checkout@v4
1620
with:
@@ -26,7 +30,7 @@ jobs:
2630
sim:
2731
runs-on: ubuntu-latest
2832
container:
29-
image: ivvitc/nos3-64:20250124
33+
image: ivvitc/nos3-64:20250514
3034
steps:
3135
- uses: actions/checkout@v4
3236
with:
@@ -40,7 +44,7 @@ jobs:
4044
coverage:
4145
runs-on: ubuntu-latest
4246
container:
43-
image: ivvitc/nos3-64:20250124
47+
image: ivvitc/nos3-64:20250514
4448
steps:
4549
- uses: actions/checkout@v4
4650
with:
@@ -54,18 +58,19 @@ jobs:
5458
run: apt-get install -y gcc lcov gcovr bc
5559
- name: config
5660
run: make config
57-
- name: build-test
61+
- name: build coverage docs
5862
run: |
5963
export CFLAGS="-fprofile-arcs -ftest-coverage -g"
6064
make build-test
61-
make test-fsw
65+
make gcov
66+
- name: Upload coverage reports to Codecov
67+
uses: codecov/codecov-action@v5
68+
with:
69+
token: ${{ secrets.CODECOV_TOKEN }}
70+
verbose: true
71+
recurse_submodules: true
6272
- name: Archive Coverage Directory
6373
uses: actions/upload-artifact@v4
6474
with:
6575
name: coverage-artifacts
66-
path: docs/coverage
67-
- name: Upload coverage reports to Codecov
68-
uses: codecov/codecov-action@v5
69-
with:
70-
token: 040717d0-b624-470e-be41-d08720135088
71-
76+
path: docs/coverage

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ __pycache__
1010
# Build Files
1111
#
1212
build
13+
*.gcov
1314
*.o
1415
support/nos3_install.log
1516
tmp
@@ -28,5 +29,8 @@ cam.jpg
2829
#
2930
# Documentation
3031
#
32+
docs/coverage/coverage_report.*
3133
docs/wiki/_build
3234
docs/wiki/_templates
35+
*.bkp
36+
*.html

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,7 @@
156156
path = gsw/yamcs
157157
url = https://github.com/nasa-itc/yamcs-nos3.git
158158
branch = main
159+
[submodule "components/mgr"]
160+
path = components/mgr
161+
url = https://github.com/nasa-itc/mgr.git
162+
branch = main

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Government Agency Original Software Title:
1919
User Registration Requested. Please Visit
2020
https://github.com/nasa/nos3
2121
Government Agency Point of Contact for Original Software:
22-
John.P.Lucas@nasa.gov
22+
Justin.R.Morris@nasa.gov
2323

2424
1. DEFINITIONS
2525

0 commit comments

Comments
 (0)