summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2020-02-20 19:06:57 +0100
committerraveit65 <[email protected]>2020-02-20 19:06:57 +0100
commit2acfffca08a81d4cd5c85c17851ae5b347191edd (patch)
tree17067b9d94dc6ca753cfedac320a0e6fb452d5ee
parentba11e452fe4b884017d91f2f743a759850fddf32 (diff)
downloadmarco-2acfffca08a81d4cd5c85c17851ae5b347191edd.tar.bz2
marco-2acfffca08a81d4cd5c85c17851ae5b347191edd.tar.xz
travis: update config for new travis validation
-rw-r--r--.build.yml180
-rw-r--r--.travis.yml185
2 files changed, 183 insertions, 182 deletions
diff --git a/.build.yml b/.build.yml
new file mode 100644
index 00000000..8b1c5dab
--- /dev/null
+++ b/.build.yml
@@ -0,0 +1,180 @@
+##########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+ archlinux:
+ # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/marco/trunk/PKGBUILD
+ - autoconf-archive
+ - clang
+ - gcc
+ - git
+ - glib2
+ - gtk3
+ - intltool
+ - libcanberra
+ - libgtop
+ - libxpresent
+ - make
+ - mate-common
+ - mate-desktop
+ - which
+ - yelp-tools
+ - zenity
+
+ debian:
+ # Useful URL: https://github.com/mate-desktop/debian-packages
+ # Useful URL: https://salsa.debian.org/debian-mate-team/marco
+ - autoconf-archive
+ - autopoint
+ - clang
+ - clang-tools
+ - cppcheck
+ - gcc
+ - git
+ - intltool
+ - libcanberra-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libgtop2-dev
+ - libice-dev
+ - libpango1.0-dev
+ - libsm-dev
+ - libstartup-notification0-dev
+ - libx11-dev
+ - libxcomposite-dev
+ - libxcursor-dev
+ - libxdamage-dev
+ - libxext-dev
+ - libxfixes-dev
+ - libxinerama-dev
+ - libxpresent-dev
+ - libxrandr-dev
+ - libxrender-dev
+ - libxt-dev
+ - make
+ - mate-common
+ - x11proto-present-dev
+ - yelp-tools
+ - zenity
+
+ fedora:
+ # Useful URL: https://src.fedoraproject.org/cgit/rpms/marco.git
+ - autoconf-archive
+ - clang-analyzer
+ - clang
+ - cppcheck-htmlreport
+ - desktop-file-utils
+ - gcc
+ - git
+ - gtk3-devel
+ - libSM-devel
+ - libXdamage-devel
+ - libXpresent-devel
+ - libcanberra-devel
+ - libgtop2-devel
+ - libsoup-devel
+ - make
+ - mate-common
+ - mate-desktop-devel
+ - redhat-rpm-config
+ - startup-notification-devel
+ - yelp-tools
+ - zenity
+
+ ubuntu:
+ - autoconf-archive
+ - autopoint
+ - clang
+ - clang-tools
+ - git
+ - intltool
+ - libcanberra-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libgtop2-dev
+ - libice-dev
+ - libpango1.0-dev
+ - libsm-dev
+ - libstartup-notification0-dev
+ - libx11-dev
+ - libxcomposite-dev
+ - libxcursor-dev
+ - libxdamage-dev
+ - libxext-dev
+ - libxfixes-dev
+ - libxinerama-dev
+ - libxpresent-dev
+ - libxrandr-dev
+ - libxrender-dev
+ - libxt-dev
+ - make
+ - mate-common
+ - x11proto-present-dev
+ - yelp-tools
+ - zenity
+
+variables:
+ - CFLAGS="-Wall -Wcast-align -Wchar-subscripts -Werror=format-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wsign-compare -Wshadow"
+ - '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}
+ - '[ -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 --force -D'PACKAGE' -D'WITH_VERBOSE_MODE' .
+ - fi
+
+after_scripts:
+ - if [ ${DISTRO_NAME} == "fedora" ];then
+ - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude --force -D'PACKAGE' -D'WITH_VERBOSE_MODE' .
+ - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
+ - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/preferences-system-windows.png
+ - fi
+ - make distcheck
+
+releases:
+ draft: false
+ prerelease: false
+ checksum: true
+ file_glob: true
+ files: marco-*.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 ce8e6c4e..8790eedb 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
@@ -58,182 +58,3 @@ env:
- 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/marco/trunk/PKGBUILD
- - autoconf-archive
- - clang
- - gcc
- - git
- - glib2
- - gtk3
- - intltool
- - libcanberra
- - libgtop
- - libxpresent
- - make
- - mate-common
- - mate-desktop
- - which
- - yelp-tools
- - zenity
-
- debian:
- # Useful URL: https://github.com/mate-desktop/debian-packages
- # Useful URL: https://salsa.debian.org/debian-mate-team/marco
- - autoconf-archive
- - autopoint
- - clang
- - clang-tools
- - cppcheck
- - gcc
- - git
- - intltool
- - libcanberra-gtk3-dev
- - libglib2.0-dev
- - libgtk-3-dev
- - libgtop2-dev
- - libice-dev
- - libpango1.0-dev
- - libsm-dev
- - libstartup-notification0-dev
- - libx11-dev
- - libxcomposite-dev
- - libxcursor-dev
- - libxdamage-dev
- - libxext-dev
- - libxfixes-dev
- - libxinerama-dev
- - libxpresent-dev
- - libxrandr-dev
- - libxrender-dev
- - libxt-dev
- - make
- - mate-common
- - x11proto-present-dev
- - yelp-tools
- - zenity
-
- fedora:
- # Useful URL: https://src.fedoraproject.org/cgit/rpms/marco.git
- - autoconf-archive
- - clang-analyzer
- - clang
- - cppcheck-htmlreport
- - desktop-file-utils
- - gcc
- - git
- - gtk3-devel
- - libSM-devel
- - libXdamage-devel
- - libXpresent-devel
- - libcanberra-devel
- - libgtop2-devel
- - libsoup-devel
- - make
- - mate-common
- - mate-desktop-devel
- - redhat-rpm-config
- - startup-notification-devel
- - yelp-tools
- - zenity
-
- ubuntu:
- - autoconf-archive
- - autopoint
- - clang
- - clang-tools
- - git
- - intltool
- - libcanberra-gtk3-dev
- - libglib2.0-dev
- - libgtk-3-dev
- - libgtop2-dev
- - libice-dev
- - libpango1.0-dev
- - libsm-dev
- - libstartup-notification0-dev
- - libx11-dev
- - libxcomposite-dev
- - libxcursor-dev
- - libxdamage-dev
- - libxext-dev
- - libxfixes-dev
- - libxinerama-dev
- - libxpresent-dev
- - libxrandr-dev
- - libxrender-dev
- - libxt-dev
- - make
- - mate-common
- - x11proto-present-dev
- - yelp-tools
- - zenity
-
-variables:
- - CFLAGS="-Wall -Wcast-align -Wchar-subscripts -Werror=format-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wsign-compare -Wshadow"
- - '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}
- - '[ -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 --force -D'PACKAGE' -D'WITH_VERBOSE_MODE' .
- - fi
-
-after_scripts:
- - if [ ${DISTRO_NAME} == "fedora" ];then
- - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude --force -D'PACKAGE' -D'WITH_VERBOSE_MODE' .
- - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
- - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/preferences-system-windows.png
- - fi
- - make distcheck
-
-releases:
- draft: false
- prerelease: false
- checksum: true
- file_glob: true
- files: marco-*.tar.xz
- github_release:
- tags: true
- overwrite: true
- base_version: 1.20.0
- notify_servers:
- - https://release.mate-desktop.org/release