diff options
| author | Wu Xiaotian <[email protected]> | 2019-01-27 19:08:11 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-02-01 09:51:32 +0100 |
| commit | fa47df139b3c52f9d54391338c6d7f4f54b7444c (patch) | |
| tree | 6fcc244a66bcdb6a0d3fdba63b9429aa9c6e8b36 | |
| parent | 8e2df0852ec4622f5652175e0effb5cadb1911c8 (diff) | |
| download | mate-notification-daemon-fa47df139b3c52f9d54391338c6d7f4f54b7444c.tar.bz2 mate-notification-daemon-fa47df139b3c52f9d54391338c6d7f4f54b7444c.tar.xz | |
Update to use the latest docker-build script.
| -rw-r--r-- | .docker.json | 72 | ||||
| -rw-r--r-- | .travis.yml | 83 |
2 files changed, 80 insertions, 75 deletions
diff --git a/.docker.json b/.docker.json deleted file mode 100644 index d9974bb..0000000 --- a/.docker.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "requires" : { - "archlinux" : [ - "gcc", - "git", - "gtk3", - "intltool", - "libnotify", - "libwnck3", - "make", - "mate-common" - ], - "debian" : [ - "git", - "gobject-introspection", - "gtk-doc-tools", - "intltool", - "libcanberra-gtk3-dev", - "libdconf-dev", - "libexempi-dev", - "libexif-dev", - "libgail-3-dev", - "libgirepository1.0-dev", - "libglib2.0-dev", - "libgtk-3-dev", - "libmate-desktop-dev", - "libnotify-dev", - "libpango1.0-dev", - "libstartup-notification0-dev", - "libwnck-3-dev", - "libx11-dev", - "libxml2-dev", - "mate-common", - "quilt", - "shared-mime-info" - ], - "fedora" : [ - "desktop-file-utils", - "git", - "libcanberra-devel", - "libnotify-devel", - "libwnck3-devel", - "mate-common", - "mate-desktop-devel" - ], - "ubuntu" : [ - "git", - "gobject-introspection", - "gtk-doc-tools", - "intltool", - "libcanberra-gtk3-dev", - "libdconf-dev", - "libexempi-dev", - "libexif-dev", - "libgail-3-dev", - "libgirepository1.0-dev", - "libglib2.0-dev", - "libgtk-3-dev", - "libmate-desktop-dev", - "libnotify-dev", - "libpango1.0-dev", - "libstartup-notification0-dev", - "libwnck-3-dev", - "libx11-dev", - "libxml2-dev", - "mate-common", - "quilt", - "shared-mime-info" - ] - }, - "distcheck" : true -}
\ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 89b94e9..b7514af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ +# vim: set ts=2 sts=2 sw=2 expandtab : +dist: xenial sudo: required +language: bash services: - docker @@ -7,13 +10,87 @@ before_install: - chmod +x docker-build install: - - ./docker-build --name ${DISTRO} --verbose --install + - ./docker-build --name ${DISTRO} --config .travis.yml --install script: - - ./docker-build --name ${DISTRO} --verbose --build make + - ./docker-build --name ${DISTRO} --verbose --config .travis.yml --build autotools env: - DISTRO="base/archlinux" - DISTRO="debian:sid" - DISTRO="fedora:29" - - DISTRO="ubuntu:18.10"
\ No newline at end of file + - DISTRO="ubuntu:18.10" + +########################################################## +# THE FOLLOWING LINES IS USED BY docker-build +########################################################## +requires: + archlinux: + - gcc + - git # Required to generate the ChangeLog file + - gtk3 + - intltool + - libnotify + - libwnck3 + - make + - mate-common + debian: + - git # Required to generate the ChangeLog file + - gobject-introspection + - gtk-doc-tools + - intltool + - libcanberra-gtk3-dev + - libdconf-dev + - libexempi-dev + - libexif-dev + - libgail-3-dev + - libgirepository1.0-dev + - libglib2.0-dev + - libgtk-3-dev + - libmate-desktop-dev + - libnotify-dev + - libpango1.0-dev + - libstartup-notification0-dev + - libwnck-3-dev + - libx11-dev + - libxml2-dev + - mate-common + - quilt + - shared-mime-info + fedora: + # Useful URL: https://src.fedoraproject.org/cgit/rpms/caja.git/ + - git # Required to generate the ChangeLog file + - desktop-file-utils + - file + - libcanberra-devel + - libnotify-devel + - libwnck3-devel + - mate-common + - mate-desktop-devel + ubuntu: + - git # Required to generate the ChangeLog file + - gobject-introspection + - gtk-doc-tools + - intltool + - libcanberra-gtk3-dev + - libdconf-dev + - libexempi-dev + - libexif-dev + - libgail-3-dev + - libgirepository1.0-dev + - libglib2.0-dev + - libgtk-3-dev + - libmate-desktop-dev + - libnotify-dev + - libpango1.0-dev + - libstartup-notification0-dev + - libwnck-3-dev + - libx11-dev + - libxml2-dev + - mate-common + - quilt + - shared-mime-info +variables: + - CFLAGS="-Wall" +after_scripts: + - make distcheck |