Commit 6a5e53dd authored by Johan Ouwerkerk's avatar Johan Ouwerkerk

Minor cleanup: grep has -q for this.

parent 13701646
Pipeline #20171 skipped with stage
......@@ -20,12 +20,8 @@ fi
arguments=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.14 --key cmake-options)
build-cmake $project kde:$project $arguments $@
set +e
grep ToolsTargets.cmake$ build-*/$project/install_manifest.txt > /dev/null
hasTools=$?
set -e
if [ $hasTools -eq 0 ]; then
if grep -q ToolsTargets.cmake$ build-*/$project/install_manifest.txt
then
all_packages=$(python3 ci-tooling/helpers/list-dependencies.py --withProject $project --platform AndroidQt5.14)
echo "Dependencies to build for native $project: $all_packages"
......@@ -33,5 +29,5 @@ if [ $hasTools -eq 0 ]; then
BUILD=build-native build-cmake-native $a kde:$a -DCMAKE_INSTALL_PREFIX=/opt/nativetooling -DBUILD_TESTING=OFF -DQt5_DIR=/opt/nativetooling/lib/cmake/Qt5 -DKCONFIG_USE_GUI=OFF -DQt5Core_DIR=/opt/nativetooling/lib/cmake/Qt5Core -DQt5Qml_DIR=/opt/nativetooling/lib/cmake/Qt5Qml -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON
done
else
echo "No tooling $hasTools"
echo "No tooling $?"
fi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment