aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-05-04 17:33:55 +0200
committerRobert Tari <robert@tari.in>2021-05-04 17:33:55 +0200
commitdd675b4d9d02b73969ab47ed6a8ed4a13ea2cfa5 (patch)
treebdf69e562acdb1f3127cd828de5f70903f67fa75
parenteee97a7fa0086b071b025d50adbc40323b07b882 (diff)
parent0d7148e0530c069785834c4516f45de255da8f72 (diff)
downloadayatana-indicator-application-dd675b4d9d02b73969ab47ed6a8ed4a13ea2cfa5.tar.gz
ayatana-indicator-application-dd675b4d9d02b73969ab47ed6a8ed4a13ea2cfa5.tar.bz2
ayatana-indicator-application-dd675b4d9d02b73969ab47ed6a8ed4a13ea2cfa5.zip
Merge branch 'sunweaver-pr/travis-ci'
Attributes GH PR #9: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/9
-rw-r--r--.build.yml145
-rw-r--r--.travis.yml43
-rw-r--r--src/Makefile.am4
3 files changed, 190 insertions, 2 deletions
diff --git a/.build.yml b/.build.yml
new file mode 100644
index 0000000..aaaf1d2
--- /dev/null
+++ b/.build.yml
@@ -0,0 +1,145 @@
+#########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+ archlinux:
+ # Useful URL: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ayatana-indicator-application
+ - clang
+ - gcc
+ - git
+ - make
+ - startup-notification
+ - which
+ - cmake
+ - cmake-extras
+ - mate-common
+ - xorg-server-xvfb
+ - glib2
+ - gtk3
+ - dbus-glib
+ - json-glib
+ - intltool
+ - libayatana-appindicator
+ - libayatana-indicator
+ - libdbusmenu-glib
+ - libdbusmenu-gtk3
+ - systemd
+
+ debian:
+ # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-application
+ - autopoint
+ - clang
+ - clang-tools
+ - g++
+ - cppcheck
+ - git
+ - cmake
+ - cmake-extras
+ - mate-common
+ - intltool
+ - libdbus-glib-1-dev
+ - libayatana-appindicator3-dev
+ - libayatana-indicator3-dev
+ - libdbusmenu-glib-dev
+ - libdbusmenu-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libjson-glib-dev
+ - systemd
+ - dbus-test-runner
+ - xvfb
+
+ ubuntu:
+ - autopoint
+ - clang
+ - clang-tools
+ - g++
+ - git
+ - cmake
+ - cmake-extras
+ - mate-common
+ - intltool
+ - libdbus-glib-1-dev
+ - libayatana-appindicator3-dev
+ - libayatana-indicator3-dev
+ - libdbusmenu-glib-dev
+ - libdbusmenu-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libjson-glib-dev
+ - systemd
+ - dbus-test-runner
+ - xvfb
+
+variables:
+ - 'CHECKERS="
+ -enable-checker deadcode.DeadStores
+ -enable-checker alpha.deadcode.UnreachableCode
+ -enable-checker alpha.core.CastSize
+ -enable-checker alpha.core.CastToStruct
+ -enable-checker alpha.core.IdenticalExpr
+ -enable-checker alpha.core.SizeofPtr
+ -enable-checker alpha.security.ArrayBoundV2
+ -enable-checker alpha.security.MallocOverflow
+ -enable-checker alpha.security.ReturnPtrRange
+ -enable-checker alpha.unix.SimpleStream
+ -enable-checker alpha.unix.cstring.BufferOverlap
+ -enable-checker alpha.unix.cstring.NotNullTerminated
+ -enable-checker alpha.unix.cstring.OutOfBounds
+ -enable-checker alpha.core.FixedAddr
+ -enable-checker security.insecureAPI.strcpy"'
+
+before_scripts:
+ - cd ${START_DIR}
+ - if [ ! -d libayatana-common-build ]; then
+ - git clone --depth 1 https://github.com/AyatanaIndicators/libayatana-common.git libayatana-common-build
+ - fi
+ - cd libayatana-common-build
+ - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ - make
+ - make install
+
+build_scripts:
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - export CFLAGS+=" -Wsign-compare -Wunused-parameter"
+ - 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 [ ${DISTRO_NAME} == "debian" ];then
+ - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
+ - else
+ - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
+ - fi
+ - else
+ - exit 1
+ - fi
+ -
+ - if [ $CPU_COUNT -gt 1 ]; then
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT
+ - make clean
+ - fi
+ - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT
+ - else
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make
+ - make clean
+ - 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 ./autogen.sh ]; then
+ - ${XVFB_RUN} make check
+ - elif [ -e ./CMakeLists.txt ]; then
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - fi
+ - fi
+ - fi
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5382638
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,43 @@
+# vim: set ts=2 sts=2 sw=2 expandtab :
+dist: bionic
+language: shell
+os: linux
+
+arch:
+ - amd64
+ - ppc64le
+
+services:
+ - docker
+
+addons:
+ apt:
+ packages:
+ - python3-pip
+ - python3-setuptools
+
+before_install:
+ # let's use the MATE project's docker build script...
+ - curl -Ls -o docker-build https://github.com/AyatanaIndicators/ayatana-dev-scripts/raw/master/travis/docker-build
+ - chmod +x docker-build
+
+install:
+ - pip3 install wheel
+ - pip3 install PyGithub
+ - ./docker-build --name ${DISTRO} --config .build.yml --install
+
+script:
+ - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts
+
+env:
+# temp disable of archlinux builds, see https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/56
+# - DISTRO="archlinux:latest"
+ - DISTRO="debian:testing"
+ - DISTRO="debian:stable"
+# - DISTRO="ubuntu:rolling"
+ - DISTRO="ubuntu:focal"
+
+jobs:
+ exclude:
+ - env: DISTRO="archlinux:latest"
+ arch: ppc64le
diff --git a/src/Makefile.am b/src/Makefile.am
index 20fd503..916b745 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ libayatana_application_la_CFLAGS = $(INDICATOR_CFLAGS) \
-Wl,-Bsymbolic-functions \
-Wl,-z,defs \
-Wl,--as-needed \
- -Werror -Wno-error=deprecated-declarations \
+ -Wno-error=deprecated-declarations \
-DG_LOG_DOMAIN=\"Ayatana-Indicator-Application\"
libayatana_application_la_LIBADD = $(INDICATOR_LIBS)
libayatana_application_la_LDFLAGS = $(COVERAGE_LDFLAGS) \
@@ -55,7 +55,7 @@ ayatana_indicator_application_service_CFLAGS = \
$(APPINDICATOR_CFLAGS) \
$(COVERAGE_CFLAGS) \
-DDATADIR="\"$(pkgdatadir)\"" \
- -Wall -Werror -Wno-error=deprecated-declarations \
+ -Wall -Wno-error=deprecated-declarations \
-DG_LOG_DOMAIN=\"ayatana-indicator-application-service\"
ayatana_indicator_application_service_LDADD = \