Skip to content

Commit 58ed163

Browse files
authored
Merge pull request #216 from nasa/devel
Release 1.5.0 to master
2 parents f28c92e + 68fecef commit 58ed163

File tree

4,790 files changed

+724847
-30236
lines changed

Some content is hidden

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

4,790 files changed

+724847
-30236
lines changed

.github/actions/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM nasafprime/fprime-base:latest
2+
3+
# Copies your code file from your action repository to the filesystem path `/` of the container
4+
COPY entrypoint.sh /entrypoint.sh
5+
6+
# Code file to execute when the docker container starts up (`entrypoint.sh`)
7+
ENTRYPOINT ["/entrypoint.sh"]
8+

.github/actions/entrypoint.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
# Exit when any command fails
4+
set -e
5+
6+
cd "$GITHUB_WORKSPACE"
7+
"$GITHUB_WORKSPACE/mk/ci/master.bash" QUICK
8+
"$GITHUB_WORKSPACE/mk/ci/master.bash" STATIC

.github/actions/github-ci-action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name: 'F prime CI'
2+
description: 'Runs continuous integration testing on F prime'
3+
runs:
4+
using: 'docker'
5+
image: 'Dockerfile'

.github/workflows/build-test.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: CI
4+
5+
# Controls when the action will run. Triggers the workflow on push or pull request
6+
# events but only for the master branch
7+
on:
8+
push:
9+
branches: [ master, devel ]
10+
pull_request:
11+
branches: [ master, devel ]
12+
13+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
14+
jobs:
15+
# This workflow contains a single job called "build"
16+
build:
17+
# The type of runner that the job will run on
18+
runs-on: ubuntu-latest
19+
20+
# Steps represent a sequence of tasks that will be executed as part of the job
21+
steps:
22+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
23+
- uses: actions/checkout@v2
24+
# Runs the CI action internal to the repository
25+
- name: F prime CI step
26+
uses: ./.github/actions/
27+
id: github-ci-action

.gitignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
build
2-
build*
1+
build/
2+
build*/
33

44
AutoXML/
55
test_harness/src/test_harness-C/application.out
@@ -64,3 +64,14 @@ core
6464
py_dict
6565
.settings
6666
build-fprime-automatic*
67+
68+
/Ref/bin
69+
/RPI/bin
70+
/ci-venv/
71+
/ci-logs*
72+
TesterBase.*
73+
GTestBase.*
74+
/Fw/Python/.eggs
75+
/Fw/Python/src/fprime.egg-info
76+
/Gds/src/fprime_gds.egg-info
77+
**/DefaultDict/serializable/*

.lgtm.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
##############
2+
# Cofiguration file for LGTM.com
3+
# Currently only needed for cpp code since python and js works by default
4+
#
5+
# @author: Hunter Paulson
6+
# @modified: 2020-07-15
7+
##############
8+
9+
10+
path_classifiers:
11+
test:
12+
- "/Gds/test"
13+
- "/Fw/Python/test"
14+
docs:
15+
- "/docs"
16+
queries:
17+
# Not excluding any results right now because we want to be alerted for all issues and fixes
18+
# In the future we may exclude depreciated code like ptf/ and Gds/src/wxgui/
19+
# - exclude:
20+
extraction:
21+
cpp:
22+
prepare:
23+
packages:
24+
- "python3"
25+
- "python3-pip"
26+
- "python3-venv"
27+
after_prepare:
28+
# setup the venv and install packages
29+
- "python3 -m venv ./fprime-venv"
30+
- ". ./fprime-venv/bin/activate"
31+
- "pip install ./Fw/Python"
32+
- "pip install ./Gds"
33+
configure:
34+
command:
35+
before_index:
36+
- "fprime-util generate"
37+
index:
38+
build_command:
39+
- "cd build-fprime-automatic-default/"
40+
- "fprime-util build-all"

.pre-commit-config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
repos:
2+
- repo: https://github.com/psf/black
3+
rev: 19.3b0
4+
hooks:
5+
- id: black
6+
name: Format Python Code (black) in Fw/Python/
7+
files: '^Fw/Python/'
8+
- id: black
9+
name: Format Python Code (black) in Gds/
10+
files: '^Gds/'
11+
exclude: '^Gds/src/fprime_gds/wxgui/'

0 commit comments

Comments
 (0)