JehanneOS/devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

travis: fix paths for caches

Browse Source
This commit is contained in:
Giacomo Tesio 2016-11-26 17:55:21 +01:00
parent 4646c02d92
commit 76025ed4b0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
continuous-build.sh
View File

@ -17,7 +17,7 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin" echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin"
if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then
echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/" echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/"
mv $JEHANNE/tmp/toolchain/ $JEHANNE/hacking/cross/toolchain mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
else else
echo "Creating cross-compiling toolchain..." echo "Creating cross-compiling toolchain..."
(cd $JEHANNE/hacking/cross/; ./init.sh) (cd $JEHANNE/hacking/cross/; ./init.sh)
@ -40,6 +40,9 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
if [ "$TRAVIS_BUILD_DIR" != "" ]; then if [ "$TRAVIS_BUILD_DIR" != "" ]; then
echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches" echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches"
mv $JEHANNE/hacking/cross/toolchain $JEHANNE/tmp/toolchain/ if [ ! -d "$JEHANNE/tmp/toolchain" ]; then
mkdir $JEHANNE/tmp/toolchain
fi
mv $JEHANNE/hacking/cross/toolchain/* $JEHANNE/tmp/toolchain/
fi fi
fi fi

7
coverity-scan.sh
View File

@ -16,7 +16,7 @@ if [ ! -f "$JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-gcc" ]; then
echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin" echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin"
if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then
echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/" echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/"
mv $JEHANNE/tmp/toolchain/ $JEHANNE/hacking/cross/toolchain mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
else else
echo "Creating cross-compiling toolchain..." echo "Creating cross-compiling toolchain..."
(cd $JEHANNE/hacking/cross/; ./init.sh) (cd $JEHANNE/hacking/cross/; ./init.sh)
@ -32,5 +32,8 @@ build all
if [ "$TRAVIS_BUILD_DIR" != "" ]; then if [ "$TRAVIS_BUILD_DIR" != "" ]; then
echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches" echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches"
mv $JEHANNE/hacking/cross/toolchain $JEHANNE/tmp/toolchain/ if [ ! -d "$JEHANNE/tmp/toolchain" ]; then
mkdir $JEHANNE/tmp/toolchain
fi
mv $JEHANNE/hacking/cross/toolchain/* $JEHANNE/tmp/toolchain/
fi fi