aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-23 15:00:26 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-23 15:11:23 +0100
commita3f809d95d9c44dc8839aa6c8377f0e9048b2333 (patch)
treea86575feb127508868dd9cd39ac8c69616c4568f
parentMerge pull request #463 from christophgysin/typo (diff)
downloadsway-a3f809d95d9c44dc8839aa6c8377f0e9048b2333.tar.gz
sway-a3f809d95d9c44dc8839aa6c8377f0e9048b2333.tar.zst
sway-a3f809d95d9c44dc8839aa6c8377f0e9048b2333.zip
travis: don't build wlc, depend on wlc-git instead
-rwxr-xr-x.ci/build.sh16
-rw-r--r--.travis.yml12
2 files changed, 3 insertions, 25 deletions
diff --git a/.ci/build.sh b/.ci/build.sh
deleted file mode 100755
index ece5b2a3..00000000
--- a/.ci/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
1#!/bin/bash
2
3# clone and build wlc
4git clone https://github.com/Cloudef/wlc.git
5cd wlc
6git submodule update --init --recursive # - initialize and fetch submodules
7mkdir target && cd target # - create build target directory
8cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake
9make # - compile
10sudo make install # - install
11
12cd ../..
13
14# build sway
15cmake .
16make
diff --git a/.travis.yml b/.travis.yml
index ad746552..8532066d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,23 +11,17 @@ arch:
11 - cmake 11 - cmake
12 - xorg-server-xwayland 12 - xorg-server-xwayland
13 - asciidoc 13 - asciidoc
14 - pcre
15 - json-c 14 - json-c
16 - pixman
17 - wayland 15 - wayland
18 - libxkbcommon
19 - libinput
20 - libx11
21 - libxcb
22 - xcb-util-image 16 - xcb-util-image
23 - libgl
24 - mesa
25 - pango 17 - pango
26 - cairo 18 - cairo
27 - gdk-pixbuf2 19 - gdk-pixbuf2
28 - xcb-util-wm 20 - xcb-util-wm
21 - wlc-git
29 script: 22 script:
30 - "bash .ci/build.sh" 23 - "cmake ."
24 - "make"
31 25
32script: 26script:
33 - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" 27 - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"