From 441c558be133bbda4259cadf20f86a1231d614f0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 11:56:44 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.build.yml b/.build.yml index 9e1190f..25fd8de 100644 --- a/.build.yml +++ b/.build.yml @@ -12,7 +12,6 @@ requires: - which - cmake - cmake-extras - - mate-common - xorg-server-xvfb - glib2 - gtk3 @@ -26,7 +25,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-application - - autopoint - clang - clang-tools - g++ @@ -34,7 +32,6 @@ requires: - git - cmake - cmake-extras - - mate-common - cli-common-dev - intltool - libdbus-1-dev @@ -62,14 +59,12 @@ requires: - xvfb ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - cli-common-dev - intltool - libdbus-1-dev @@ -148,10 +143,7 @@ build_scripts: - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - - if [ -e ./autogen.sh ]; then - - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - - elif [ -e ./CMakeLists.txt ]; then + - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else @@ -179,9 +171,7 @@ after_scripts: - if [ ${BUILD_TYPE} == "scripts" ];then - XVFB_RUN="$(which xvfb-run || true)" - if [ ${DISTRO_NAME} == "debian" ];then - - if [ -e ./autogen.sh ]; then - - ${XVFB_RUN} make check - - elif [ -e ./CMakeLists.txt ]; then + - if [ -e ./CMakeLists.txt ]; then - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - fi - fi -- cgit v1.2.3 From d20a158999eb6617446f6e9c6e5f8b6397231cd6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 11:57:30 +0200 Subject: .build.yml: Run unit tests in build_scripts: target. --- .build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.build.yml b/.build.yml index 25fd8de..270539c 100644 --- a/.build.yml +++ b/.build.yml @@ -166,13 +166,9 @@ build_scripts: - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - -after_scripts: - - if [ ${BUILD_TYPE} == "scripts" ];then - - XVFB_RUN="$(which xvfb-run || true)" - - if [ ${DISTRO_NAME} == "debian" ];then - - if [ -e ./CMakeLists.txt ]; then - - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - - fi + - XVFB_RUN="$(which xvfb-run || true)" + - if [ ${DISTRO_NAME} == "debian" ];then + - if [ -e ./CMakeLists.txt ]; then + - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - fi - fi -- cgit v1.2.3 From fd4b4925f9733ef58cd51cea1be01e5b5dedfcfb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 11:59:13 +0200 Subject: .build.yml: Remove source code of locally built dependencies after they have been installed. --- .build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.build.yml b/.build.yml index 270539c..f6a3567 100644 --- a/.build.yml +++ b/.build.yml @@ -118,6 +118,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf ayatana-ido-build/ - - cd ${START_DIR} - if [ ! -d libayatana-indicator-build ]; then @@ -127,6 +129,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-indicator-build/ - - cd ${START_DIR} - if [ ! -d libayatana-appindicator-build ]; then @@ -136,6 +140,7 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - rm -Rf libayatana-appindicator-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then -- cgit v1.2.3 From 6eec5b59d238fa1409e84c1d2bc7ce19fe30b968 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:13:14 +0200 Subject: .build.yml: Comment out running unit tests (no tests in project). --- .build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.build.yml b/.build.yml index f6a3567..acd3c25 100644 --- a/.build.yml +++ b/.build.yml @@ -171,9 +171,9 @@ build_scripts: - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - - XVFB_RUN="$(which xvfb-run || true)" - - if [ ${DISTRO_NAME} == "debian" ];then - - if [ -e ./CMakeLists.txt ]; then - - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - - fi - - fi +# - XVFB_RUN="$(which xvfb-run || true)" +# - if [ ${DISTRO_NAME} == "debian" ];then +# - if [ -e ./CMakeLists.txt ]; then +# - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test +# - fi +# - fi -- cgit v1.2.3 From 3ea315ff1a96864cf4aa4ee445930c9dc4ce3dfc Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 2 Sep 2021 14:52:38 +0200 Subject: Fix Travis status image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 153b38d..7929cfe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ayatana-indicator-application - Ayatana Indicator Application Service [![Build Status](https://travis-ci.com/AyatanaIndicators/ayatana-indicator-application.svg)](https://travis-ci.com/AyatanaIndicators/ayatana-indicator-application) +# ayatana-indicator-application - Ayatana Indicator Application Service [![Build Status](https://api.travis-ci.com/AyatanaIndicators/ayatana-indicator-application.svg)](https://travis-ci.com/github/AyatanaIndicators/ayatana-indicator-application) ## About Ayatana Indicators -- cgit v1.2.3 From a80c0270f177c83fcfb376ac0b4d624a924bd61a Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 20 Oct 2021 20:50:59 +0200 Subject: .travis.yml: Temporarily disable ppc64le builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51db47f..9556732 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ os: linux arch: - amd64 - - ppc64le +# - ppc64le services: - docker -- cgit v1.2.3