travis: use Ninja, fix imgur_upload.sh to correctly display wget instructions and use only WARNING verbosity

This commit is contained in:
Gautier Pelloux-Prayer 2015-07-02 10:20:32 +02:00
parent 50d7dacf06
commit ecc39e196e
3 changed files with 6 additions and 6 deletions

View file

@ -12,7 +12,7 @@ env:
before_install:
- brew update 1>/dev/null
- brew install doxygen nasm gettext yasm optipng imagemagick coreutils intltool
- brew install doxygen nasm gettext yasm optipng imagemagick coreutils intltool ninja
- brew outdated cmake || brew upgrade cmake
- brew link gettext --force
- brew tap Gui13/linphone
@ -25,8 +25,8 @@ before_install:
- git submodule update --init --recursive
install:
- ./prepare.py i386
- make -j1 -s 1>/dev/null
- ./prepare.py i386 -G Ninja
- make -j4 -s 1>/dev/null
- mkdir -p $KIF_SCREENSHOTS
script:

View file

@ -42,7 +42,7 @@ NSString* const kLogsUpdateNotification = @"kLogsUpdateNotification";
lastLogs = [[NSMutableArray alloc] initWithCapacity:kLastLogsCapacity];
logsBuffer = [NSMutableArray arrayWithCapacity:kLogsBufferCapacity];
// linphone_core_set_log_level(ORTP_MESSAGE);
linphone_core_set_log_level(ORTP_WARNING);
linphone_core_set_log_handler((OrtpLogFunc)linphone_iphone_log_handler);
}

View file

@ -27,12 +27,12 @@ if [ ! -z "$(find . -name "*.png")" ]; then
if [ "$succeeded" != "true" ]; then
echo "There was a problem uploading \"$filepath\": $result"
else
download_cmds="${download_cmds}wget $(echo "$result" | underscore extract 'data.link')\n"
download_cmds="${download_cmds}\nwget $(echo "$result" | underscore extract 'data.link')"
fi
done
echo "All uploads complete!"
echo ""
echo "Download via: $download_cmds"
printf "Download via: $download_cmds\n"
else
echo "Could not find any PNG in $PWD, something must be broken!"
fi