From 3d034271717b3a0c7f9be842a478d4d59a1eafc1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:02:14 +0200 Subject: .build.yml: Drop autogen.sh support. --- .build.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.build.yml b/.build.yml index 8dba6fc..99536b4 100644 --- a/.build.yml +++ b/.build.yml @@ -23,7 +23,6 @@ requires: debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-bluetooth - - autopoint - clang - clang-tools - g++ @@ -31,7 +30,6 @@ requires: - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -42,14 +40,12 @@ requires: - liblomiri-url-dispatcher-dev ubuntu: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -60,14 +56,12 @@ requires: - liblomiri-url-dispatcher-dev ubuntu:focal: - - autopoint - clang - clang-tools - g++ - git - cmake - cmake-extras - - mate-common - intltool - libglib2.0-dev - systemd @@ -110,10 +104,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" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else @@ -141,9 +132,7 @@ build_scripts: # - if [ ${BUILD_TYPE} == "scripts" ];then # - XVFB_RUN="$(which xvfb-run || true)" # - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];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 7bec1ae9288703d2da110a50910c5f8e6e6425fd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:04:36 +0200 Subject: .build.yml: If we ever start having unit tests, run those 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 99536b4..f92d0d6 100644 --- a/.build.yml +++ b/.build.yml @@ -127,13 +127,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" ] || [ ${DISTRO_NAME} == "ubuntu" ];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" ] || [ ${DISTRO_NAME} == "ubuntu" ];then +# - if [ -e ./CMakeLists.txt ]; then +# - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test # - fi # - fi -- cgit v1.2.3 From a300ef3b4371234ce8a45e46be96d16fcb9b5f36 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 26 Oct 2021 11:27:51 +0200 Subject: .build.yml. Skip cppcheck run for the bluetooth indicator, only Vala code in here. --- .build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.build.yml b/.build.yml index f92d0d6..9130aec 100644 --- a/.build.yml +++ b/.build.yml @@ -99,11 +99,12 @@ before_scripts: - make install build_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - - fi - - +# No C/C++ code in this project (only Vala). So skip cppcheck run. +# - if [ ${DISTRO_NAME} == "debian" ];then +# - export CFLAGS+=" -Wsign-compare -Wunused-parameter" +# - cppcheck --enable=warning,style,performance,portability,information,missingInclude . +# - fi +# - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -- cgit v1.2.3 From 0472b402e33ae5737f63c3e983c7a69f7f2277f3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 25 Oct 2021 12:05:58 +0200 Subject: .build.yml: Remove source code of locally built dependency after it has been installed. --- .build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.build.yml b/.build.yml index 9130aec..c7de24e 100644 --- a/.build.yml +++ b/.build.yml @@ -97,6 +97,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd - + - rm -Rf libayatana-common-build/ build_scripts: # No C/C++ code in this project (only Vala). So skip cppcheck run. -- cgit v1.2.3