aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-01 10:45:53 +0100
committerRobert Tari <robert@tari.in>2021-11-01 10:45:53 +0100
commit71b39fb0df9b444da73ac420146a71fecfbc6efd (patch)
tree095288d2a58de9b96288038532ddca654acf26be
parentc9063c6b37ce788a68a73498599dbaa2af9eff20 (diff)
parente43c2098e23b5200d00c08af9691c9c4bb27e864 (diff)
downloadlibayatana-indicator-71b39fb0df9b444da73ac420146a71fecfbc6efd.tar.gz
libayatana-indicator-71b39fb0df9b444da73ac420146a71fecfbc6efd.tar.bz2
libayatana-indicator-71b39fb0df9b444da73ac420146a71fecfbc6efd.zip
Merge branch 'sunweaver-pr/travis-cleanup'
Attributes GH PR #58: https://github.com/AyatanaIndicators/libayatana-indicator/pull/58
-rw-r--r--.build.yml35
1 files changed, 15 insertions, 20 deletions
diff --git a/.build.yml b/.build.yml
index 6aca8ad..1bd20d9 100644
--- a/.build.yml
+++ b/.build.yml
@@ -11,7 +11,8 @@ requires:
- startup-notification
- which
- pacman
- - mate-common
+ - cmake
+ - cmake-extras
- gtk3
- glib2
# - ayatana-ido
@@ -21,7 +22,6 @@ requires:
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/libayatana-indicator
- - autopoint
- clang
- clang-tools
- cppcheck
@@ -29,7 +29,6 @@ requires:
- libtool
- cmake
- cmake-extras
- - mate-common
- at-spi2-core
- intltool
- gtk-doc-tools
@@ -47,14 +46,12 @@ requires:
- xvfb
ubuntu:
- - autopoint
- clang
- clang-tools
- git
- libtool
- cmake
- cmake-extras
- - mate-common
- at-spi2-core
- intltool
- gtk-doc-tools
@@ -95,6 +92,8 @@ before_scripts:
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
- make install
+ - cd -
+ - rm -Rf ayatana-ido-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
@@ -170,19 +169,15 @@ build_scripts:
- scan-build $CHECKERS --keep-cc -o html-report make
- fi
- cd ../
-
-after_scripts:
- - if [ ${BUILD_TYPE} == "scripts" ];then
- - XVFB_RUN="$(which xvfb-run || true)"
- - if [ ${DISTRO_NAME} == "debian" ];then
- - cd build-gtk3/
- - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- - cd ../
- - cd build-gtk3-no-IDO/
- - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- - cd ../
- - cd build-gtk2/
- - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- - cd ../
- - fi
+ -
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - cd build-gtk3/
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - cd ../
+ - cd build-gtk3-no-IDO/
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - cd ../
+ - cd build-gtk2/
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - cd ../
- fi