Skip to content

Commit

Permalink
Merge pull request #1184 from nasa/devel
Browse files Browse the repository at this point in the history
Version 3 to Master
  • Loading branch information
LeStarch authored Dec 22, 2021
2 parents 03c89d3 + 85fa25b commit edff4fc
Show file tree
Hide file tree
Showing 3,786 changed files with 34,746 additions and 337,448 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Checks: >
bugprone-unhandled-self-assignment,
modernize-deprecated-headers,
modernize-redundant-void-arg,
modernize-use-bool-literals,
modernize-use-nullptr,
-clang-analyzer-security.insecureAPI.rand
WarningsAsErrors: '*'
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.git
.github
.dockerignore
**.mdxml
**/docs
**build
1 change: 0 additions & 1 deletion .github/actions/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ USER fprime

# Code file to execute when the docker container starts up (`entrypoint.sh`)
ENTRYPOINT ["/entrypoint.sh"]

2 changes: 1 addition & 1 deletion .github/actions/autodoc.bash
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ${GITHUB_WORKSPACE}/docs/doxygen/generate_docs.bash
git add -Af "${GITHUB_WORKSPACE}/docs"


git commit -m "Autodoc on $(date)" 1>/dev/null
git commit -m "Autodoc on $(date)" || echo "No new commits, pushing merge"
git push "${REMOTE}"
6 changes: 3 additions & 3 deletions .github/actions/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
set -e
set -x
cd "$GITHUB_WORKSPACE"
if [ "$GITHUB_WORKFLOW" != "Autodocs" ]
if [ "$GITHUB_WORKFLOW" == "Autodocs" ]
then
"$GITHUB_WORKSPACE/ci/master.bash" QUICK
else
/autodoc.bash
else
"$GITHUB_WORKSPACE/ci/tests/$INPUT_TEST.bash"
fi
9 changes: 0 additions & 9 deletions .github/actions/github-autodocs.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .github/actions/github-ci-action.yml

This file was deleted.

14 changes: 9 additions & 5 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
ignore$
/html/
(?:^|/)(?i)COPYRIGHT
(?:^|/)(?i)LICEN[CS]E
(?:^|/)vendor/
^\.github/
^Autocoders/Python/test/.*\.xml$
/doc/xml/
/html/
/third-party/
\.min\.
ignore$
\.bak$
\.bin$
\.dat$
Expand All @@ -23,6 +20,7 @@ ignore$
\.md5$
\.mdxml$
\.mdzip$
\.min\.
\.otf$
\.pdf$
\.png$
Expand All @@ -39,3 +37,9 @@ ignore$
\.xls$
\.xlsx$
\.xsd$
^Autocoders/Python/test/.*\.xml$
^Autocoders/Python/test/param1/test/ut/Tester\.hpp$
^config/PolyDbImplCfg\.hpp$
^config/PrmDbImplTesterCfg\.hpp$
^RPI/settings\.ini$
^\.github/
Loading

0 comments on commit edff4fc

Please sign in to comment.