Skip to content

Commit

Permalink
Merge pull request #1543 from nasa/devel
Browse files Browse the repository at this point in the history
Delivery Attempt 2
  • Loading branch information
LeStarch authored Jun 29, 2022
2 parents edff4fc + bca03a4 commit 7bf79db
Show file tree
Hide file tree
Showing 621 changed files with 11,192 additions and 10,593 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.git
.github
.dockerignore
**.mdxml
**/docs
**build
12 changes: 0 additions & 12 deletions .github/actions/Dockerfile

This file was deleted.

15 changes: 15 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Setup F´'
description: 'Setup the F´ repository and tools'
inputs:
location:
required: true
default: $GITHUB_WORKSPACE
runs:
using: "composite"
steps:
- run: git fetch --tags
shell: bash
- run: pip3 install setuptools_scm urllib3
shell: bash
- run: pip3 install -r ${{ inputs.location }}/requirements.txt
shell: bash
2 changes: 1 addition & 1 deletion .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ ignore$
\.log$
\.map$
\.md5$
\.mdxml$
\.mdzip$
\.min\.
\.otf$
Expand All @@ -37,6 +36,7 @@ ignore$
\.xls$
\.xlsx$
\.xsd$
\.vsdx$
^Autocoders/Python/test/.*\.xml$
^Autocoders/Python/test/param1/test/ut/Tester\.hpp$
^config/PolyDbImplCfg\.hpp$
Expand Down
31 changes: 30 additions & 1 deletion .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ACTIVELOGGERIMPL
ACTIVELOGGERIMPLCFG
ACTIVELOGGERIMPLTESTER
ACTIVERATEGROUP
ACTIVERATEGROUPIMPLCFG
ACTIVERATEGROUPCFG
ACTIVERATEGROUPIMPLTESTER
ACTIVETEXTLOGGERIMPL
actools
Expand All @@ -30,6 +30,9 @@ aeiouy
afterstatinfo
agg
aheared
alignedallocator
AlignedAllocator
ALIGNEDALLOCATOR
ALLEXTERNALS
alloc
Alltypes
Expand Down Expand Up @@ -119,6 +122,7 @@ bibtex
Bies
bindir
Bitfields
bithacks
bitmaps
bitset
ble
Expand Down Expand Up @@ -226,6 +230,7 @@ colno
COLORSTYLE
colorwheel
comlogger
compat
COMMANDDISPATCHERIMPL
COMMANDDISPATCHERIMPLCFG
commandline
Expand Down Expand Up @@ -256,6 +261,8 @@ cplusplus
CPOL
cpos
cpp
cppreference
cprogramming
cpuset
cpy
CRCAMPCS
Expand Down Expand Up @@ -330,6 +337,7 @@ deque
deregistration
deser
Deserial
deserializer
deserialization
deserialize
deserialized
Expand Down Expand Up @@ -361,6 +369,7 @@ dlog
dnp
DNs
doall
docblocks
docbook
dockerfile
docset
Expand Down Expand Up @@ -388,6 +397,7 @@ doxyindexer
doxyrules
doxysearch
Doxywizard
dpi
DPRIVATE
DPROTECTED
dropdown
Expand Down Expand Up @@ -449,6 +459,7 @@ endianness
endif
endl
endloc
endmacro
endswith
enduml
ENOENT
Expand Down Expand Up @@ -604,12 +615,14 @@ getopt
getoutput
getpass
getpid
getppid
getquaternion
getroot
getsize
getsockname
getstate
getstatus
gettempdir
gettime
gettimeofday
getty
Expand All @@ -618,6 +631,7 @@ gh
ghprb
github
gjslint
glibc
globals
gmail
gmtime
Expand Down Expand Up @@ -921,6 +935,7 @@ maxsize
maxspew
mccabe
mcomment
MCT
mcternan
mday
mdbasiccomponents
Expand Down Expand Up @@ -1084,6 +1099,7 @@ opcodes
opendir
openjdk
opengroup
openmct
openpyxl
openssl
oper
Expand Down Expand Up @@ -1113,6 +1129,8 @@ outbool
outdir
outout
overridable
ovr
ovrTrace
packetization
packetize
packetized
Expand Down Expand Up @@ -1145,6 +1163,7 @@ PINGSEND
pinit
pkill
pkts
placeholders
plainnat
plantuml
plugin
Expand All @@ -1166,6 +1185,7 @@ PORTSELECTOR
PORTSOUT
posix
ppandian
ppid
pport
PQueue
Prashanth
Expand All @@ -1182,6 +1202,7 @@ PRId
printables
printf
println
prioritization
PRIu
prm
PRMDB
Expand Down Expand Up @@ -1236,6 +1257,7 @@ QEvent
qhelpgenerator
QHG
qhp
QNX
qsf
qtest
qthelpproject
Expand Down Expand Up @@ -1345,6 +1367,7 @@ scons
scp
scrollbars
sdd
seander
searchdata
SEARCHENGINE
segfault
Expand Down Expand Up @@ -1378,6 +1401,7 @@ settime
settingsini
settype
setuptools
setvalue
setw
sev
sface
Expand Down Expand Up @@ -1418,6 +1442,7 @@ sometask
somevalue
sommercharles
soudry
sourced
SOURCEDIR
sourceforge
Sourcetrail
Expand Down Expand Up @@ -1512,6 +1537,7 @@ synchronicity
synopsys
sys
SYSFS
sysinfo
systemd
tabbedwidths
tabccitt
Expand Down Expand Up @@ -1700,6 +1726,7 @@ upl
upto
URI
url
urllib
usb
usec
usecond
Expand Down Expand Up @@ -1727,6 +1754,7 @@ VFILE
vfs
vhd
vhdl
VID
viewforum
virt
virtualbox
Expand Down Expand Up @@ -1762,6 +1790,7 @@ whitelist
wiki
wikipedia
wildcards
WLE
Wno
Wnon
workaround
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/autodocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ jobs:
name: Autodocumentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: "Checkout F´ Repository"
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install fprime tools
run: pip3 install fprime-tools fprime-gds
- uses: ./.github/actions/setup
- name: Setup Dependencies
run: sudo apt-get install doxygen
run: |
sudo apt-get update
sudo apt-get install doxygen
- name: Autodocs
run: .github/actions/autodoc.bash
27 changes: 15 additions & 12 deletions .github/workflows/build-test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ jobs:
MacOS-Framework:
runs-on: macos-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Install fprime tools
run: pip3 install fprime-tools fprime-gds
- name: "Checkout F´ Repository"
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Framework.bash
# Archive the outputs
Expand All @@ -33,10 +34,11 @@ jobs:
MacOS-Ref:
runs-on: macos-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Install fprime tools
run: pip3 install fprime-tools fprime-gds
- name: "Checkout F´ Repository"
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Ref.bash
# Archive the outputs
Expand All @@ -51,10 +53,11 @@ jobs:
MacOS-Integration:
runs-on: macos-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Install fprime tools
run: pip3 install fprime-tools fprime-gds
- name: "Checkout F´ Repository"
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup
- name: Install coreutils
run: brew install coreutils
- name: F prime CI step
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build-test-rpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ jobs:
RPI:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Install fprime tools
run: pip3 install fprime-tools fprime-gds
- name: "Checkout F´ Repository"
uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: ./.github/actions/setup
- name: Install RPI Toolchain
run: sudo git clone https://github.com/raspberrypi/tools.git /opt/rpi/tools
- name: F prime CI step
Expand Down Expand Up @@ -63,3 +64,4 @@ jobs:
if: always()
run: |
rm -rf $RUNNER_WORKSPACE
sudo /sbin/shutdown -r 1 # Force a shutdown for a clean slate
Loading

0 comments on commit 7bf79db

Please sign in to comment.