Merge pull request #83 from nasa/integration-candidate

Integration Candidate COMBINED 2020-04-29 and 2020-05-06
nasa · May 13, 2020 · a4345d8 · a4345d8
2 parents 8f8ec69 + f3de263
commit a4345d8
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 10 deletions.
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -15,6 +15,6 @@ extraction:
       build_command:
       - "cp cfe/cmake/Makefile.sample Makefile"
       - "cp -r cfe/cmake/sample_defs sample_defs"
-      - "make prep"
+      - "make OMIT_DEPRECATED=true prep"
       - "make"
 
diff --git a/.travis.yml b/.travis.yml
@@ -124,3 +124,7 @@ script:
             grep -i 'warn\|err\|fail' cFS_startup.txt
             exit -1
     fi
+
+# After script sleep avoids Job log truncation
+after_script:
+  - sleep 1
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/psp b/psp
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl