Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Candidate COMBINED 2020-04-29 and 2020-05-06 #83

Merged
merged 12 commits into from
May 13, 2020
Merged

Integration Candidate COMBINED 2020-04-29 and 2020-05-06 #83

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4e9e030
Fix #72, LGTM now OMIT_DEPRECATED build
skliper Apr 27, 2020
3918fd4
Fix #79, Add sleep after script to avoid truncated log
skliper May 5, 2020
7335be9
Merge pull request #80 from skliper/fix79-trucated-ci-log
astrogeco May 8, 2020
a8a6be1
Merge pull request #73 from skliper/fix72-lgtm-omit-deprecated
astrogeco May 8, 2020
e88592f
First update for Integration Candidate: 2020-04-29
May 8, 2020
3faa89e
Updated cfe, osal, and psp based on resolved conflicts in parent repos
May 8, 2020
4cf2969
Update cFE with fs_UT fix
skliper May 11, 2020
d30f12e
Updated OSAL to latest IC
skliper May 11, 2020
fb8f91e
Update SAMPLE_APP and CFE to include UT fixes
jphickey May 11, 2020
5032e7c
Update TO_LAB with pull #29
jphickey May 11, 2020
2cbccac
Set all submodules to master
May 13, 2020
f3de263
Update osal to 5.0.16
May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix #72, LGTM now OMIT_DEPRECATED build
  • Loading branch information
@skliper
skliper committed Apr 28, 2020
commit 4e9e0308739cd1be22561974cb55a254d1779af7
2 changes: 1 addition & 1 deletion .lgtm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"