Skip to content

Commit

Permalink
Merge pull request #1973 from nasa/devel: v3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LeStarch authored Apr 20, 2023
2 parents 91c578e + c87fd5e commit 5c05e60
Show file tree
Hide file tree
Showing 873 changed files with 21,753 additions and 19,765 deletions.
5 changes: 5 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
BasedOnStyle: Chromium
IndentWidth: 4
ColumnLimit: 120
AccessModifierOffset: -2
2 changes: 1 addition & 1 deletion .github/actions/autodoc.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git config --local user.name "nasa-fprime[bot]"
git fetch "${REMOTE}" release/documentation
git fetch "${REMOTE}" devel
git checkout release/documentation
git merge "${REMOTE}"/devel
GIT_EDITOR=true git merge "${REMOTE}"/devel
${GITHUB_WORKSPACE}/docs/doxygen/generate_docs.bash
git add -Af "${GITHUB_WORKSPACE}/docs"

Expand Down
12 changes: 12 additions & 0 deletions .github/actions/codeql/jpl-standard-pack-1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: "CodeQL JPL Coding Standard - Errors and Warnings"

disable-default-queries: true

packs:
# Source of the query pack is https://github.com/github/codeql/tree/main/cpp/ql/src/JPL_C
- codeql/cpp-queries:JPL_C

query-filters:
- exclude:
problem.severity:
- recommendation
20 changes: 20 additions & 0 deletions .github/actions/codeql/jpl-standard-pack-2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "CodeQL JPL Coding Standard - Recommendations 1 of 2"

disable-default-queries: true

packs:
# Source of the query pack is https://github.com/github/codeql/tree/main/cpp/ql/src/JPL_C
- codeql/cpp-queries:JPL_C

query-filters:
- exclude:
problem.severity:
- error
- warning
# We are excluding the following query because it overflows the limit of
# 5000 results that the SARIF upload can handle
# This sole query is ran in jpl-standard-pack-3.yml
# https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#uploading-a-code-scanning-analysis-with-github-actions
- exclude:
id:
- cpp/jpl-c/basic-int-types
13 changes: 13 additions & 0 deletions .github/actions/codeql/jpl-standard-pack-3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: "CodeQL JPL Coding Standard - Recommendations 2 of 2"

disable-default-queries: true

packs:
# Source of the query pack is https://github.com/github/codeql/tree/main/cpp/ql/src/JPL_C
- codeql/cpp-queries:JPL_C

query-filters:
# This will ONLY include the following query
- include:
id:
- cpp/jpl-c/basic-int-types
19 changes: 19 additions & 0 deletions .github/actions/codeql/security-pack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "CodeQL security and quality"

queries:
- uses: security-and-quality

query-filters:
- include:
id: cpp/incorrect-not-operator-usage
- include:
tags contain: correctness
- include:
tags contain: reliability

paths-ignore:
- docs/
- cmake/docs/
- cmake/test/
- Autocoders/Python/src/fprime_ac/utils/DiffAndRename.py
- Autocoders/Python/src/fprime_ac/utils/pyparsing.py
12 changes: 11 additions & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ runs:
steps:
- run: git fetch --tags
shell: bash
- run: pip3 install setuptools_scm urllib3
- name: Add Python bin to PATH
run: echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
shell: bash
- run: pip3 install setuptools_scm wheel urllib3
shell: bash
- run: pip3 install -r ${{ inputs.location }}/requirements.txt
shell: bash
- run: which fprime-util
shell: bash
- run: which fprime-gds
shell: bash
- run: which fpp-check
shell: bash

1 change: 1 addition & 0 deletions .github/actions/spelling/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ File | Purpose | Format | Info
[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/spelling/advice.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
<details><summary>If the flagged items are false positives</summary>
<details><summary>If the flagged items are :exploding_head: false positives</summary>

If items relate to a ...
* binary file (or some other file you wouldn't want to check at all).
Expand Down
6 changes: 6 additions & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
github
https
ssh
ubuntu
workaround
workarounds
Loading

0 comments on commit 5c05e60

Please sign in to comment.