Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4624 from champtar/travis

Browse source 
build,travis: do not modify .travis.yml
This commit is contained in:
champtar 2017-07-25 07:55:33 -07:00 committed by GitHub
commit df1f3a41c8
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -11,5 +11,4 @@ before_script:
- ./.travis_do.sh download_sdk - ./.travis_do.sh download_sdk
script: script:
- ./.travis_do.sh test_commits
- ./.travis_do.sh test_packages - ./.travis_do.sh test_packages

16
.travis_do.sh
View file

@ -55,9 +55,8 @@ download_sdk() {
} }
# test_package will run on the `script` step. # test_package will run on the `script` step.
# test_package call make download check for very new/modified package in it's # test_package call make download check for very new/modified package
# own clean sdk directory test_packages2() {
test_packages() {
# search for new or modified packages. PKGS will hold a list of package like 'admin/muninlite admin/monit ...' # search for new or modified packages. PKGS will hold a list of package like 'admin/muninlite admin/monit ...'
PKGS=$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep 'Makefile$' | grep -v '/files/' | awk -F'/Makefile' '{ print $1 }') PKGS=$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep 'Makefile$' | grep -v '/files/' | awk -F'/Makefile' '{ print $1 }')
@ -101,7 +100,7 @@ EOF
echo_blue "=== $pkg_name Finished package" echo_blue "=== $pkg_name Finished package"
done done
exit $RET return $RET
} }
test_commits() { test_commits() {
@ -139,7 +138,14 @@ test_commits() {
fi fi
done done
exit $RET return $RET
}
test_packages() {
GRET=0
test_commits || GRET=1
test_packages2 || GRET=1
return $GRET
} }
echo_blue "=== Travis ENV" echo_blue "=== Travis ENV"