summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml17
-rwxr-xr-x.travis/bazel-linux35
2 files changed, 0 insertions, 52 deletions
diff --git a/.travis.yml b/.travis.yml
index 224f4dcc..de83351f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,23 +38,6 @@ jobs:
38 install: .travis/$JOB install 38 install: .travis/$JOB install
39 script: .travis/$JOB script 39 script: .travis/$JOB script
40 - stage: "Stage 1" 40 - stage: "Stage 1"
41 env: JOB=bazel-linux
42 compiler: clang
43 before_install:
44 # Clear bazel installation.
45 - rm -rf $HOME/.cache/bazel/_bazel_$USER/install
46 # Get toktok-stack, which contains the bazel workspace.
47 - cd ..
48 - git clone --depth=1 --branch=upgrade-bazel https://github.com/iphydf/toktok-stack
49 - rm -rf toktok-stack/c-toxcore
50 - mv c-toxcore toktok-stack/
51 - cd toktok-stack/c-toxcore
52 install: .travis/$JOB install
53 script: .travis/$JOB script
54 before_cache:
55 # Clear bazel installation.
56 - rm -rf $HOME/.cache/bazel/_bazel_$USER/install
57 - stage: "Stage 1"
58 if: type IN (push, api, cron) 41 if: type IN (push, api, cron)
59 env: JOB=cmake-win32 42 env: JOB=cmake-win32
60 services: [docker] 43 services: [docker]
diff --git a/.travis/bazel-linux b/.travis/bazel-linux
deleted file mode 100755
index e76f3f86..00000000
--- a/.travis/bazel-linux
+++ /dev/null
@@ -1,35 +0,0 @@
1#!/bin/sh
2
3ACTION="$1"
4
5set -eu
6
7travis_install() {
8 # Get bazel.
9 wget https://github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-installer-linux-x86_64.sh
10 chmod +x bazel-2.2.0-installer-linux-x86_64.sh
11 ./bazel-2.2.0-installer-linux-x86_64.sh --user
12 echo 'build --jobs=4 --curses=no --verbose_failures' >> $HOME/.bazelrc
13 echo 'build --config=linux' >> $HOME/.bazelrc
14 echo "build --config=$CC" >> $HOME/.bazelrc
15 echo "build --config=remote" >> $HOME/.bazelrc
16 pip install --user yamllint
17}
18
19travis_script() {
20 yamllint -c ../tools/project/yamllint.rc .
21 bazel test \
22 //c-toxcore:license_test \
23 //c-toxcore:readme_test
24
25 # TODO(iphydf): Make tests have a chance to succeed.
26 # Run the tests, but if they fail, at least we should be able to build.
27 # bazel test //c-toxcore/... || bazel build //c-toxcore/...
28 bazel build //c-toxcore/...
29}
30
31if [ "-z" "$ACTION" ]; then
32 "travis_script"
33else
34 "travis_$ACTION"
35fi