diff options
-rw-r--r-- | .build.yml | 21 | ||||
-rw-r--r-- | .travis.yml | 26 |
2 files changed, 19 insertions, 28 deletions
@@ -1,7 +1,7 @@ | |||
1 | # vim: ft=yaml ts=2 sw=2 et : | 1 | # vim: ft=yaml ts=2 sw=2 et : |
2 | image: archlinux | 2 | image: archlinux |
3 | packages: | 3 | packages: |
4 | - cmake | 4 | - meson |
5 | - wlc-git | 5 | - wlc-git |
6 | - xorg-server-xwayland | 6 | - xorg-server-xwayland |
7 | - xcb-util-image | 7 | - xcb-util-image |
@@ -9,25 +9,22 @@ packages: | |||
9 | - pango | 9 | - pango |
10 | - cairo | 10 | - cairo |
11 | - wayland | 11 | - wayland |
12 | - wayland-protocols | ||
12 | - gdk-pixbuf2 | 13 | - gdk-pixbuf2 |
13 | - meson | 14 | - libinput |
15 | - libxkbcommon | ||
14 | sources: | 16 | sources: |
15 | - https://git.sr.ht/~sircmpwn/sway | 17 | - https://git.sr.ht/~sircmpwn/sway |
16 | - https://git.sr.ht/~sircmpwn/wlroots | 18 | - https://git.sr.ht/~sircmpwn/wlroots |
17 | tasks: | 19 | tasks: |
18 | - wlroots: | | 20 | - wlroots: | |
19 | cd wlroots | 21 | cd wlroots |
20 | mkdir build | 22 | meson --prefix=/usr build |
21 | cd build | 23 | ninja -C build |
22 | meson --prefix=/usr .. | 24 | sudo ninja -C build install |
23 | ninja | ||
24 | sudo ninja install | ||
25 | - setup: | | 25 | - setup: | |
26 | cd sway | 26 | cd sway |
27 | mkdir build | 27 | meson build |
28 | cd build | ||
29 | cmake .. | ||
30 | - build: | | 28 | - build: | |
31 | cd sway | 29 | cd sway |
32 | cd build | 30 | ninja -C build |
33 | make | ||
diff --git a/.travis.yml b/.travis.yml index bc1ee45b..db717718 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -7,35 +7,29 @@ compiler: | |||
7 | - clang | 7 | - clang |
8 | 8 | ||
9 | env: | 9 | env: |
10 | - BUILD_TYPE=Release | 10 | - BUILD_TYPE=release |
11 | - BUILD_TYPE=Debug | 11 | - BUILD_TYPE=debug |
12 | - BUILD_TYPE=ASAN | ||
13 | 12 | ||
14 | arch: | 13 | arch: |
15 | packages: | 14 | packages: |
16 | - cmake | 15 | - meson |
16 | - ninja | ||
17 | - xorg-server-xwayland | 17 | - xorg-server-xwayland |
18 | - json-c | 18 | - json-c |
19 | - wayland | 19 | - wayland |
20 | - wayland-protocols | ||
20 | - xcb-util-image | 21 | - xcb-util-image |
21 | - pango | 22 | - pango |
22 | - cairo | 23 | - cairo |
23 | - gdk-pixbuf2 | 24 | - gdk-pixbuf2 |
24 | - wlc-git | ||
25 | - libcap | 25 | - libcap |
26 | - meson | 26 | - libinput |
27 | - libxkbcommon | ||
27 | script: | 28 | script: |
28 | - git clone https://github.com/swaywm/wlroots | 29 | - git clone https://github.com/swaywm/wlroots |
29 | - cd wlroots | 30 | - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install' |
30 | - mkdir build | 31 | - meson build --buildtype=$BUILD_TYPE |
31 | - cd build | 32 | - ninja -C build |
32 | - meson --prefix=/usr .. | ||
33 | - sudo ninja install | ||
34 | - cd ../.. | ||
35 | - cmake . | ||
36 | - make | ||
37 | - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . | ||
38 | - make | ||
39 | 33 | ||
40 | script: | 34 | script: |
41 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" | 35 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" |