diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-24 21:04:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-24 21:04:18 +0200 |
| commit | 52bade66cf86f70cb2be5f8c785f47b9c7f10192 (patch) | |
| tree | b1c2d662c9d8ce539cbba3b7d8bef0c31028fd73 | |
| parent | d34e8050d84cc3c4347fc7bc8f6a3d72a0ef0d46 (diff) | |
| download | libayatana-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 ||).
| -rw-r--r-- | .build.yml | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |