From 9c232cee5990a9ac37ad038419293f8bee5f1936 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Fri, 21 Feb 2020 11:24:16 +0100 Subject: Travis CI: Fix build error, add .build.yml --- .build.yml | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 172 ++---------------------------------------------------------- 2 files changed, 168 insertions(+), 169 deletions(-) create mode 100644 .build.yml diff --git a/.build.yml b/.build.yml new file mode 100644 index 00000000..750deeee --- /dev/null +++ b/.build.yml @@ -0,0 +1,165 @@ +########################################################## +# THE FOLLOWING LINES IS USED BY docker-build +########################################################## +requires: + archlinux: + # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-utils + - autoconf-archive + - clang + - gcc + - git + - itstool + - libcanberra + - libgtop + - make + - mate-common + - mate-panel + - python + - udisks2 + - which + - yelp-tools + + debian: + # Useful URL: https://github.com/mate-desktop/debian-packages + # Useful URL: https://salsa.debian.org/debian-mate-team/mate-utils + - autoconf-archive + - autopoint + - clang + - clang-tools + - cppcheck + - gcc + - g++ + - git + - gtk-doc-tools + - libcanberra-gtk3-dev + - libglib2.0-dev + - libgtk-3-dev + - libgtop2-dev + - libmate-panel-applet-dev + - libudisks2-dev + - libx11-dev + - libxext-dev + - libxt-dev + - make + - mate-common + - x11proto-xext-dev + - xsltproc + - yelp-tools + - zlib1g-dev + + fedora: + # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-utils.git + - autoconf-archive + - clang + - clang-analyzer + - cppcheck-htmlreport + - desktop-file-utils + - e2fsprogs-devel + - gcc + - gcc-c++ + - git + - hardlink + - libX11-devel + - libXmu-devel + - libcanberra-devel + - libgtop2-devel + - libudisks2-devel + - make + - mate-common + - mate-panel-devel + - mesa-libGL-devel + - popt-devel + - redhat-rpm-config + - usermode + - yelp-tools + + ubuntu: + - autoconf-archive + - autopoint + - clang + - clang-tools + - g++ + - git + - gtk-doc-tools + - libcanberra-gtk3-dev + - libglib2.0-dev + - libgtk-3-dev + - libgtop2-dev + - libmate-panel-applet-dev + - libudisks2-dev + - libx11-dev + - libxext-dev + - libxt-dev + - make + - mate-common + - x11proto-xext-dev + - xsltproc + - yelp-tools + - zlib1g-dev + +variables: + - CFLAGS="-Wall -Werror=format-security -Wredundant-decls" + - '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: + # disable pt language for help in search tool + - sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am + - cd ${START_DIR} + - '[ -f mate-common-1.23.3.tar.xz ] || curl -Ls -o mate-common-1.23.3.tar.xz http://pub.mate-desktop.org/releases/1.23/mate-common-1.23.3.tar.xz' + - tar xf mate-common-1.23.3.tar.xz + - cd mate-common-1.23.3 + - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then + - ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu + - else + - ./configure --prefix=/usr + - fi + - make + - make install + +build_scripts: + - ./autogen.sh --enable-compile-warnings=maximum + - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum + - if [ $CPU_COUNT -gt 1 ]; then + - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT + - else + - scan-build $CHECKERS --keep-cc -o html-report make + - fi + - if [ ${DISTRO_NAME} == "debian" ];then + - cppcheck --enable=warning,style,performance,portability,information,missingInclude . + - fi + +after_scripts: + - if [ ${DISTRO_NAME} == "fedora" ];then + - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude . + - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport + - ./gen-index -l 20 + - fi + - make distcheck + +releases: + draft: false + prerelease: false + checksum: true + file_glob: true + files: mate-utils-*.tar.xz + github_release: + tags: true + overwrite: true + base_version: 1.20.0 + notify_servers: + - https://release.mate-desktop.org/release diff --git a/.travis.yml b/.travis.yml index 34f40dcd..54ae69d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,10 @@ install: - sudo apt-get install -y python3-pip python3-setuptools - sudo pip3 install --upgrade pip - sudo pip install PyGithub - - ./docker-build --name ${DISTRO} --config .travis.yml --install + - ./docker-build --name ${DISTRO} --config .build.yml --install script: - - ./docker-build --name ${DISTRO} --verbose --config .travis.yml --build scripts + - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts deploy: - provider: pages @@ -35,7 +35,7 @@ deploy: all_branches: true condition: ${DISTRO} =~ ^fedora.*$ - provider: script - script: ./docker-build --verbose --config .travis.yml --release github + script: ./docker-build --verbose --config .build.yml --release github skip_cleanup: true on: tags: true @@ -57,169 +57,3 @@ env: - DISTRO="debian:testing" - DISTRO="fedora:latest" - DISTRO="ubuntu:19.10" - -########################################################## -# THE FOLLOWING LINES IS USED BY docker-build -########################################################## -requires: - archlinux: - # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-utils - - autoconf-archive - - clang - - gcc - - git - - itstool - - libcanberra - - libgtop - - make - - mate-common - - mate-panel - - python - - udisks2 - - which - - yelp-tools - - debian: - # Useful URL: https://github.com/mate-desktop/debian-packages - # Useful URL: https://salsa.debian.org/debian-mate-team/mate-utils - - autoconf-archive - - autopoint - - clang - - clang-tools - - cppcheck - - gcc - - g++ - - git - - gtk-doc-tools - - libcanberra-gtk3-dev - - libglib2.0-dev - - libgtk-3-dev - - libgtop2-dev - - libmate-panel-applet-dev - - libudisks2-dev - - libx11-dev - - libxext-dev - - libxt-dev - - make - - mate-common - - x11proto-xext-dev - - xsltproc - - yelp-tools - - zlib1g-dev - - fedora: - # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-utils.git - - autoconf-archive - - clang - - clang-analyzer - - cppcheck-htmlreport - - desktop-file-utils - - e2fsprogs-devel - - gcc - - gcc-c++ - - git - - hardlink - - libX11-devel - - libXmu-devel - - libcanberra-devel - - libgtop2-devel - - libudisks2-devel - - make - - mate-common - - mate-panel-devel - - mesa-libGL-devel - - popt-devel - - redhat-rpm-config - - usermode - - yelp-tools - - ubuntu: - - autoconf-archive - - autopoint - - clang - - clang-tools - - g++ - - git - - gtk-doc-tools - - libcanberra-gtk3-dev - - libglib2.0-dev - - libgtk-3-dev - - libgtop2-dev - - libmate-panel-applet-dev - - libudisks2-dev - - libx11-dev - - libxext-dev - - libxt-dev - - make - - mate-common - - x11proto-xext-dev - - xsltproc - - yelp-tools - - zlib1g-dev - -variables: - - CFLAGS="-Wall -Werror=format-security -Wredundant-decls" - - '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: - # disable pt language for help in search tool - - sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am - - cd ${START_DIR} - - '[ -f mate-common-1.23.3.tar.xz ] || curl -Ls -o mate-common-1.23.3.tar.xz http://pub.mate-desktop.org/releases/1.23/mate-common-1.23.3.tar.xz' - - tar xf mate-common-1.23.3.tar.xz - - cd mate-common-1.23.3 - - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then - - ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu - - else - - ./configure --prefix=/usr - - fi - - make - - make install - -build_scripts: - - ./autogen.sh --enable-compile-warnings=maximum - - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum - - if [ $CPU_COUNT -gt 1 ]; then - - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - - else - - scan-build $CHECKERS --keep-cc -o html-report make - - fi - - if [ ${DISTRO_NAME} == "debian" ];then - - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - - fi - -after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 - - fi - - make distcheck - -releases: - draft: false - prerelease: false - checksum: true - file_glob: true - files: mate-utils-*.tar.xz - github_release: - tags: true - overwrite: true - base_version: 1.20.0 - notify_servers: - - https://release.mate-desktop.org/release -- cgit v1.2.1