From 52bade66cf86f70cb2be5f8c785f47b9c7f10192 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 21:04:18 +0200 Subject: .build.yml: Fix building and running unit tests (mixed up of && and ||). --- .build.yml | 6 +++--- 1 file 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 -- cgit v1.2.3