aboutsummaryrefslogtreecommitdiff
path: root/.build.yml
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-24 21:04:18 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-24 21:04:18 +0200
commit52bade66cf86f70cb2be5f8c785f47b9c7f10192 (patch)
treeb1c2d662c9d8ce539cbba3b7d8bef0c31028fd73 /.build.yml
parentd34e8050d84cc3c4347fc7bc8f6a3d72a0ef0d46 (diff)
downloadlibayatana-appindicator-52bade66cf86f70cb2be5f8c785f47b9c7f10192.tar.gz
libayatana-appindicator-52bade66cf86f70cb2be5f8c785f47b9c7f10192.tar.bz2
libayatana-appindicator-52bade66cf86f70cb2be5f8c785f47b9c7f10192.zip
.build.yml: Fix building and running unit tests (mixed up of && and ||).
Diffstat (limited to '.build.yml')
-rw-r--r--.build.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.build.yml b/.build.yml
index d95d18b..d7cc048 100644
--- a/.build.yml
+++ b/.build.yml
@@ -147,7 +147,7 @@ build_scripts:
- if [ -e ./CMakeLists.txt ]; then
- mkdir -p build/gtk3/
- cd build/gtk3/
- - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then
+ - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then
- scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK3=ON
- else
- scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK3=ON
@@ -155,7 +155,7 @@ build_scripts:
- cd -
- mkdir -p build/gtk2/
- cd build/gtk2/
- - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then
+ - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then
- scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK2=ON
- else
- scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK2=ON
@@ -204,7 +204,7 @@ build_scripts:
after_scripts:
- if [ ${BUILD_TYPE} == "scripts" ];then
- XVFB_RUN="$(which xvfb-run || true)"
- - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then
+ - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then
- if [ -e ./CMakeLists.txt ]; then
- cd build/gtk3/
- ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test