From c3457de28a37d074a960cd464445de02d6527997 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 10:45:11 -0400 Subject: Fix build yml files --- .build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 9c9e8adb..5fa8eb41 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 -- cgit v1.2.3 From 7414d9232751d378ff2840b7fb45e711b7f69477 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 22 Oct 2017 10:49:26 -0400 Subject: Also need meson --- .build.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 5fa8eb41..3717d699 100644 --- a/.build.yml +++ b/.build.yml @@ -10,6 +10,7 @@ packages: - cairo - wayland - gdk-pixbuf2 + - meson sources: - https://git.sr.ht/~sircmpwn/sway - https://git.sr.ht/~sircmpwn/wlroots diff --git a/.travis.yml b/.travis.yml index be7ac3e0..bc1ee45b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ arch: - gdk-pixbuf2 - wlc-git - libcap + - meson script: - git clone https://github.com/swaywm/wlroots - cd wlroots -- cgit v1.2.3 From 3546412fc9fb9a51b4316070eff4991c14594127 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 1 Dec 2017 05:43:08 -0500 Subject: update travis --- .build.yml | 21 +++++++++------------ .travis.yml | 26 ++++++++++---------------- 2 files changed, 19 insertions(+), 28 deletions(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 3717d699..a2f855e9 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 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" -- cgit v1.2.3 From 5cbb2c4879675ad198fb82de9e2e3789f8744818 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 27 Mar 2018 16:13:38 -0400 Subject: Move .build.yml repo references to github.com --- .build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index a2f855e9..8ed621a2 100644 --- a/.build.yml +++ b/.build.yml @@ -14,8 +14,8 @@ packages: - libinput - libxkbcommon sources: - - https://git.sr.ht/~sircmpwn/sway - - https://git.sr.ht/~sircmpwn/wlroots + - https://github.com/~sircmpwn/sway + - https://github.com/~sircmpwn/wlroots tasks: - wlroots: | cd wlroots -- cgit v1.2.3 From cf4db5141f939f6e55a1a8435e73452ca1868b84 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 27 Mar 2018 16:16:25 -0400 Subject: Fix broken repo references --- .build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 8ed621a2..40be2300 100644 --- a/.build.yml +++ b/.build.yml @@ -14,8 +14,8 @@ packages: - libinput - libxkbcommon sources: - - https://github.com/~sircmpwn/sway - - https://github.com/~sircmpwn/wlroots + - https://github.com/swaywm/sway + - https://github.com/swaywm/wlroots tasks: - wlroots: | cd wlroots -- cgit v1.2.3 From 0f1068ed2571210817ec5d139a44cadc4fa67565 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 5 Apr 2018 23:25:42 -0400 Subject: Remove wlc-git from .build.yml --- .build.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.build.yml') diff --git a/.build.yml b/.build.yml index 40be2300..3cfb7483 100644 --- a/.build.yml +++ b/.build.yml @@ -2,7 +2,6 @@ image: archlinux packages: - meson - - wlc-git - xorg-server-xwayland - xcb-util-image - json-c -- cgit v1.2.3