mirror of https://github.com/CGAL/cgal
Check package dependencies to decide if it should be tested by travis or not.
This commit is contained in:
parent
c42e183aa0
commit
74610660e7
|
|
@ -115,7 +115,6 @@ before_script:
|
|||
- sudo bash ./.travis/install_openmesh.sh
|
||||
script:
|
||||
- cd ./.travis
|
||||
- doxygen --version
|
||||
- bash -x -e ./build_package.sh $PACKAGE
|
||||
addons:
|
||||
apt:
|
||||
|
|
@ -144,8 +143,13 @@ addons:
|
|||
- qt55svg
|
||||
- qt55tools
|
||||
- qt55graphicaleffects
|
||||
<<<<<<< HEAD
|
||||
- libopencv-dev
|
||||
=======
|
||||
- libopencv-dev
|
||||
- bibtex2html
|
||||
|
||||
>>>>>>> ac52f483a8... finishing integration of dependencies check
|
||||
- mesa-common-dev
|
||||
- libglu1-mesa-dev
|
||||
# Not allowed (yet)
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@ for ARG in $(echo "$@")
|
|||
do
|
||||
if [ "$ARG" = "CHECK" ]
|
||||
then
|
||||
zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
|
||||
#test dependencies
|
||||
cd $ROOT
|
||||
bash Scripts/developer_scripts/cgal_check_dependencies.sh /usr/bin/doxygen
|
||||
cd .travis
|
||||
zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
|
||||
#parse current matrix and check that no package has been forgotten
|
||||
old_IFS=$IFS
|
||||
IFS=$'\n'
|
||||
|
|
@ -116,6 +116,15 @@ do
|
|||
exit 0
|
||||
fi
|
||||
|
||||
if [ -n "$TRAVIS_PULL_REQUEST" ]; then
|
||||
DO_IGNORE=FALSE
|
||||
. test_package.sh "$ROOT" "$ARG"
|
||||
echo "DO_IGNORE is $DO_IGNORE"
|
||||
if [ "$DO_IGNOE" = "TRUE" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
EXAMPLES="$ARG/examples/$ARG"
|
||||
TEST="$ARG/test/$ARG"
|
||||
DEMOS=$ROOT/$ARG/demo/*
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ before_script:
|
|||
- sudo bash ./.travis/install_openmesh.sh
|
||||
script:
|
||||
- cd ./.travis
|
||||
- doxygen --version
|
||||
- bash -x -e ./build_package.sh $PACKAGE
|
||||
addons:
|
||||
apt:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/bash
|
||||
|
||||
#Will cd $1 and test packge named $2
|
||||
#to find out if it or one of its dependencies has changed in the current branch
|
||||
|
||||
DO_IGNORE=FALSE
|
||||
cd $1
|
||||
old_IFS=$IFS
|
||||
IFS=$'\n'
|
||||
|
||||
LIST_OF_FILES=$(git diff --name-only origin/master |cut -d/ -f1 |uniq |sort)
|
||||
LIST_OF_DEPS=$(cat "$2/dependencies")
|
||||
echo "$LIST_OF_DEPS"
|
||||
for flie in $LIST_OF_DEPS
|
||||
do
|
||||
[[ $LIST_OF_FILES =~ (^|[[:space:]])$flie($|[[:space:]]) ]] && return
|
||||
done
|
||||
echo "Package ignored because none of its dependencies has been modified."
|
||||
DO_IGNORE=TRUE
|
||||
IFS=$old_IFS
|
||||
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
#This script must be called from the CGAL root.
|
||||
set -e
|
||||
set -x
|
||||
while test $# -gt 0
|
||||
do
|
||||
case "$1" in
|
||||
|
|
|
|||
Loading…
Reference in New Issue