update travis

This commit is contained in:
Tony Crisci 2017-12-01 05:43:08 -05:00
parent 0f7a7f4084
commit 3546412fc9
2 changed files with 19 additions and 28 deletions

View file

@ -1,7 +1,7 @@
# vim: ft=yaml ts=2 sw=2 et : # vim: ft=yaml ts=2 sw=2 et :
image: archlinux image: archlinux
packages: packages:
- cmake - meson
- wlc-git - wlc-git
- xorg-server-xwayland - xorg-server-xwayland
- xcb-util-image - xcb-util-image
@ -9,25 +9,22 @@ packages:
- pango - pango
- cairo - cairo
- wayland - wayland
- wayland-protocols
- gdk-pixbuf2 - gdk-pixbuf2
- meson - libinput
- libxkbcommon
sources: sources:
- https://git.sr.ht/~sircmpwn/sway - https://git.sr.ht/~sircmpwn/sway
- https://git.sr.ht/~sircmpwn/wlroots - https://git.sr.ht/~sircmpwn/wlroots
tasks: tasks:
- wlroots: | - wlroots: |
cd wlroots cd wlroots
mkdir build meson --prefix=/usr build
cd build ninja -C build
meson --prefix=/usr .. sudo ninja -C build install
ninja
sudo ninja install
- setup: | - setup: |
cd sway cd sway
mkdir build meson build
cd build
cmake ..
- build: | - build: |
cd sway cd sway
cd build ninja -C build
make

View file

@ -7,35 +7,29 @@ compiler:
- clang - clang
env: env:
- BUILD_TYPE=Release - BUILD_TYPE=release
- BUILD_TYPE=Debug - BUILD_TYPE=debug
- BUILD_TYPE=ASAN
arch: arch:
packages: packages:
- cmake - meson
- ninja
- xorg-server-xwayland - xorg-server-xwayland
- json-c - json-c
- wayland - wayland
- wayland-protocols
- xcb-util-image - xcb-util-image
- pango - pango
- cairo - cairo
- gdk-pixbuf2 - gdk-pixbuf2
- wlc-git
- libcap - libcap
- meson - libinput
- libxkbcommon
script: script:
- git clone https://github.com/swaywm/wlroots - git clone https://github.com/swaywm/wlroots
- cd wlroots - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install'
- mkdir build - meson build --buildtype=$BUILD_TYPE
- cd build - ninja -C build
- meson --prefix=/usr ..
- sudo ninja install
- cd ../..
- cmake .
- make
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
- make
script: script:
- "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"