diff options
author | Wu Xiaotian <[email protected]> | 2019-07-12 14:30:00 +0800 |
---|---|---|
committer | raveit65 <[email protected]> | 2019-07-12 14:48:53 +0200 |
commit | f6c0d20f955d7c5d7798f7044f7e5de462c90410 (patch) | |
tree | be9541d09a3ac3da13f217f0362a4f1a9ed9967a | |
parent | 6a4266535f537c7bbc7964245cb0d5f4fa1311db (diff) | |
download | mate-panel-f6c0d20f955d7c5d7798f7044f7e5de462c90410.tar.bz2 mate-panel-f6c0d20f955d7c5d7798f7044f7e5de462c90410.tar.xz |
ci: fix build error on travis for gtk-layer-shell
-rw-r--r-- | .travis.yml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 3d72be75..c8958706 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,7 @@ requires: - mate-common - mate-desktop - mate-menus + - meson - which - yelp-tools @@ -113,6 +114,7 @@ requires: - lsb-release - make - mate-common + - meson - yelp-tools fedora: @@ -134,6 +136,7 @@ requires: - mate-common - mate-desktop-devel - mate-menus-devel + - meson - redhat-rpm-config - yelp-tools @@ -166,6 +169,7 @@ requires: - lsb-release - make - mate-common + - meson - yelp-tools variables: @@ -225,16 +229,9 @@ before_scripts: - git clone --depth 1 https://github.com/wmww/gtk-layer-shell.git gtk-layer-shell-build - fi - cd gtk-layer-shell-build - - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then - - ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu - - else - - ./autogen.sh --prefix=/usr - - fi - - if [ ${TRAVIS} == "false" ]; then - - make clean - - fi - - make - - make install + - meson _build --prefix /usr + - ninja -C _build + - ninja -C _build install after_scripts: - if [ ${DISTRO_NAME} == "fedora" ];then |