Skip to content

Commit

Permalink
Merge pull request #216 from nasa/devel
Browse files Browse the repository at this point in the history
Release 1.5.0 to master
  • Loading branch information
LeStarch authored Oct 22, 2020
2 parents f28c92e + 68fecef commit 58ed163
Show file tree
Hide file tree
Showing 4,790 changed files with 724,847 additions and 30,236 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 .github/actions/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM nasafprime/fprime-base:latest

# Copies your code file from your action repository to the filesystem path `/` of the container
COPY entrypoint.sh /entrypoint.sh

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

8 changes: 8 additions & 0 deletions .github/actions/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

# Exit when any command fails
set -e

cd "$GITHUB_WORKSPACE"
"$GITHUB_WORKSPACE/mk/ci/master.bash" QUICK
"$GITHUB_WORKSPACE/mk/ci/master.bash" STATIC
5 changes: 5 additions & 0 deletions .github/actions/github-ci-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: 'F prime CI'
description: 'Runs continuous integration testing on F prime'
runs:
using: 'docker'
image: 'Dockerfile'
27 changes: 27 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master, devel ]
pull_request:
branches: [ master, devel ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Runs the CI action internal to the repository
- name: F prime CI step
uses: ./.github/actions/
id: github-ci-action
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
build
build*
build/
build*/

AutoXML/
test_harness/src/test_harness-C/application.out
Expand Down Expand Up @@ -64,3 +64,14 @@ core
py_dict
.settings
build-fprime-automatic*

/Ref/bin
/RPI/bin
/ci-venv/
/ci-logs*
TesterBase.*
GTestBase.*
/Fw/Python/.eggs
/Fw/Python/src/fprime.egg-info
/Gds/src/fprime_gds.egg-info
**/DefaultDict/serializable/*
40 changes: 40 additions & 0 deletions .lgtm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
##############
# Cofiguration file for LGTM.com
# Currently only needed for cpp code since python and js works by default
#
# @author: Hunter Paulson
# @modified: 2020-07-15
##############


path_classifiers:
test:
- "/Gds/test"
- "/Fw/Python/test"
docs:
- "/docs"
queries:
# Not excluding any results right now because we want to be alerted for all issues and fixes
# In the future we may exclude depreciated code like ptf/ and Gds/src/wxgui/
# - exclude:
extraction:
cpp:
prepare:
packages:
- "python3"
- "python3-pip"
- "python3-venv"
after_prepare:
# setup the venv and install packages
- "python3 -m venv ./fprime-venv"
- ". ./fprime-venv/bin/activate"
- "pip install ./Fw/Python"
- "pip install ./Gds"
configure:
command:
before_index:
- "fprime-util generate"
index:
build_command:
- "cd build-fprime-automatic-default/"
- "fprime-util build-all"
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
repos:
- repo: https://github.com/psf/black
rev: 19.3b0
hooks:
- id: black
name: Format Python Code (black) in Fw/Python/
files: '^Fw/Python/'
- id: black
name: Format Python Code (black) in Gds/
files: '^Gds/'
exclude: '^Gds/src/fprime_gds/wxgui/'
Loading

0 comments on commit 58ed163

Please sign in to comment.