diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-01 05:43:08 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-01 06:20:40 -0500 |
| commit | 3546412fc9fb9a51b4316070eff4991c14594127 (patch) | |
| tree | db3d94757ec043542bd4ba9d45c474f0a6a5b657 | |
| parent | 0f7a7f4084487d846100119b13b26a63ffe9b437 (diff) | |
| download | sway-3546412fc9fb9a51b4316070eff4991c14594127.tar.xz | |
update travis
| -rw-r--r-- | .build.yml | 21 | ||||
| -rw-r--r-- | .travis.yml | 26 |
2 files changed, 19 insertions, 28 deletions
@@ -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 bc1ee45b..db717718 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" |