From a3f809d95d9c44dc8839aa6c8377f0e9048b2333 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sat, 23 Jan 2016 15:00:26 +0100 Subject: [PATCH] travis: don't build wlc, depend on wlc-git instead --- .ci/build.sh | 16 ---------------- .travis.yml | 12 +++--------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100755 .ci/build.sh diff --git a/.ci/build.sh b/.ci/build.sh deleted file mode 100755 index ece5b2a35..000000000 --- a/.ci/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# clone and build wlc -git clone https://github.com/Cloudef/wlc.git -cd wlc -git submodule update --init --recursive # - initialize and fetch submodules -mkdir target && cd target # - create build target directory -cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake -make # - compile -sudo make install # - install - -cd ../.. - -# build sway -cmake . -make diff --git a/.travis.yml b/.travis.yml index ad7465523..8532066d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,17 @@ arch: - cmake - xorg-server-xwayland - asciidoc - - pcre - json-c - - pixman - wayland - - libxkbcommon - - libinput - - libx11 - - libxcb - xcb-util-image - - libgl - - mesa - pango - cairo - gdk-pixbuf2 - xcb-util-wm + - wlc-git script: - - "bash .ci/build.sh" + - "cmake ." + - "make" script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"