Skip to content

Fix linter and doxygen checks on travis #1207

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

Merged
merged 1 commit into from
Aug 8, 2017
Merged

Fix linter and doxygen checks on travis #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion scripts/travis_doxygen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ pip install --user unidiff
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
$script_folder/run_diff.sh DOXYGEN HEAD~1 # Check for errors introduced in last commit
else
$script_folder/run_diff.sh DOXYGEN $TRAVIS_BRANCH # Check for errors compared to merge target
TMP_HEAD=$(git rev-parse HEAD)
git config remote.origin.fetch +refs/heads/$TRAVIS_BRANCH:refs/remotes/origin/$TRAVIS_BRANCH
git fetch --unshallow
git checkout $TMP_HEAD
$script_folder/run_diff.sh DOXYGEN origin/$TRAVIS_BRANCH # Check for errors compared to merge target
fi
6 changes: 5 additions & 1 deletion scripts/travis_lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ pip install --user unidiff
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
$script_folder/run_diff.sh CPPLINT HEAD~1 # Check for errors introduced in last commit
else
$script_folder/run_diff.sh CPPLINT $TRAVIS_BRANCH # Check for errors compared to merge target
TMP_HEAD=$(git rev-parse HEAD)
git config remote.origin.fetch +refs/heads/$TRAVIS_BRANCH:refs/remotes/origin/$TRAVIS_BRANCH
git fetch --unshallow
git checkout $TMP_HEAD
$script_folder/run_diff.sh CPPLINT origin/$TRAVIS_BRANCH # Check for errors compared to merge target
fi