From 3546412fc9fb9a51b4316070eff4991c14594127 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Fri, 1 Dec 2017 05:43:08 -0500
Subject: [PATCH] update travis

---
 .build.yml  | 21 +++++++++------------
 .travis.yml | 26 ++++++++++----------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/.build.yml b/.build.yml
index 3717d6990..a2f855e94 100644
--- a/.build.yml
+++ b/.build.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml ts=2 sw=2 et :
 image: archlinux
 packages:
-  - cmake
+  - meson
   - wlc-git
   - xorg-server-xwayland
   - xcb-util-image
@@ -9,25 +9,22 @@ packages:
   - pango
   - cairo
   - wayland
+  - wayland-protocols
   - gdk-pixbuf2
-  - meson
+  - libinput
+  - libxkbcommon
 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
+      meson --prefix=/usr build
+      ninja -C build
+      sudo ninja -C build install
   - setup: |
       cd sway
-      mkdir build
-      cd build
-      cmake ..
+      meson build
   - build: |
       cd sway
-      cd build
-      make
+      ninja -C build
diff --git a/.travis.yml b/.travis.yml
index bc1ee45b8..db7177188 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,35 +7,29 @@ compiler:
   - clang
 
 env:
-  - BUILD_TYPE=Release
-  - BUILD_TYPE=Debug
-  - BUILD_TYPE=ASAN
+  - BUILD_TYPE=release
+  - BUILD_TYPE=debug
 
 arch:
   packages:
-    - cmake
+    - meson
+    - ninja
     - xorg-server-xwayland
     - json-c
     - wayland
+    - wayland-protocols
     - xcb-util-image
     - pango
     - cairo
     - gdk-pixbuf2
-    - wlc-git
     - libcap
-    - meson
+    - libinput
+    - libxkbcommon
   script:
     - 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
+    - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install'
+    - meson build --buildtype=$BUILD_TYPE
+    - ninja -C build
 
 script:
   - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"