epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

travis: auto-fix missing inclusion of ../RELEASE.local

Browse Source
This commit is contained in:
Ralph Lange
2020-01-10 16:27:33 +01:00
parent 7de5a7edc3
commit 8233b9f81b
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
travis-test.sh
View File

@@ -158,6 +158,7 @@ add_dependency BASE R3.15.6
[ -e $location/LICENSE ] || die "Missing dependency was not checked out" [ -e $location/LICENSE ] || die "Missing dependency was not checked out"
BUILT=$(cat "$location/built") BUILT=$(cat "$location/built")
[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")" [ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE && die "RELEASE in Base includes RELEASE.local"
# up-to-date dependency does exist in the cache # up-to-date dependency does exist in the cache
( cd $CACHEDIR; git clone --quiet --depth 5 --recursive --branch R3.15.6 https://github.com/epics-base/epics-base.git base-R3.15.6 ) ( cd $CACHEDIR; git clone --quiet --depth 5 --recursive --branch R3.15.6 https://github.com/epics-base/epics-base.git base-R3.15.6 )
@@ -173,3 +174,9 @@ BUILT=$(cat "$location/built")
[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")" [ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
rm -fr $location rm -fr $location
# missing inclusion of RELEASE.local in configure/RELEASE
location=$CACHEDIR/std-R3-4
add_dependency STD R3-4
grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE || die "Inclusion of RELEASE.local not added to configure/RELEASE"
rm -fr $location

9
travis/utils.sh
View File

@@ -176,6 +176,15 @@ add_dependency() {
git clone --quiet $deptharg $recurse --branch "$TAG" $repourl $dirname-$TAG git clone --quiet $deptharg $recurse --branch "$TAG" $repourl $dirname-$TAG
( cd $dirname-$TAG && git log -n1 ) ( cd $dirname-$TAG && git log -n1 )
modules_to_compile="${modules_to_compile} $CACHEDIR/$dirname-$TAG" modules_to_compile="${modules_to_compile} $CACHEDIR/$dirname-$TAG"
# fix non-base modules that do not include the .local files in configure/RELEASE
if [ $DEP != "BASE" ]
then
release=$CACHEDIR/$dirname-$TAG/configure/RELEASE
if [ -e $release ]
then
grep -q "include \$(TOP)/../RELEASE.local" $release || echo "-include \$(TOP)/../RELEASE.local" >> $release
fi
fi
# run hook # run hook
eval hook="\${${DEP}_HOOK}" eval hook="\${${DEP}_HOOK}"
if [ "$hook" ] if [ "$hook" ]