From c3457de28a37d074a960cd464445de02d6527997 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 10:45:11 -0400 Subject: [PATCH] Fix build yml files --- .build.yml | 8 ++++++++ .travis.yml | 13 +++++++++++-- include/sway/server.h | 1 - 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.build.yml b/.build.yml index 9c9e8adb5..5fa8eb419 100644 --- a/.build.yml +++ b/.build.yml @@ -12,7 +12,15 @@ packages: - gdk-pixbuf2 sources: - https://git.sr.ht/~sircmpwn/sway + - https://git.sr.ht/~sircmpwn/wlroots tasks: + - wlroots: | + cd wlroots + mkdir build + cd build + meson --prefix=/usr .. + ninja + sudo ninja install - setup: | cd sway mkdir build diff --git a/.travis.yml b/.travis.yml index 3eeb16820..be7ac3e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,17 @@ arch: - wlc-git - libcap script: - - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." - - "make" + - git clone https://github.com/swaywm/wlroots + - cd wlroots + - mkdir build + - cd build + - meson --prefix=/usr .. + - sudo ninja install + - cd ../.. + - cmake . + - make + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . + - make script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" diff --git a/include/sway/server.h b/include/sway/server.h index 471a0270b..9cd760aca 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -11,7 +11,6 @@ struct sway_server { // TODO WLR - //struct roots_desktop *desktop; //struct roots_input *input; struct wl_display *wl_display;