diff --git a/.travis.yml b/.travis.yml index 224f4dcc..de83351f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,23 +37,6 @@ jobs: - libvpx-dev # For toxav. install: .travis/$JOB install script: .travis/$JOB script - - stage: "Stage 1" - env: JOB=bazel-linux - compiler: clang - before_install: - # Clear bazel installation. - - rm -rf $HOME/.cache/bazel/_bazel_$USER/install - # Get toktok-stack, which contains the bazel workspace. - - cd .. - - git clone --depth=1 --branch=upgrade-bazel https://github.com/iphydf/toktok-stack - - rm -rf toktok-stack/c-toxcore - - mv c-toxcore toktok-stack/ - - cd toktok-stack/c-toxcore - install: .travis/$JOB install - script: .travis/$JOB script - before_cache: - # Clear bazel installation. - - rm -rf $HOME/.cache/bazel/_bazel_$USER/install - stage: "Stage 1" if: type IN (push, api, cron) env: JOB=cmake-win32 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 @@ -#!/bin/sh - -ACTION="$1" - -set -eu - -travis_install() { - # Get bazel. - wget https://github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-installer-linux-x86_64.sh - chmod +x bazel-2.2.0-installer-linux-x86_64.sh - ./bazel-2.2.0-installer-linux-x86_64.sh --user - echo 'build --jobs=4 --curses=no --verbose_failures' >> $HOME/.bazelrc - echo 'build --config=linux' >> $HOME/.bazelrc - echo "build --config=$CC" >> $HOME/.bazelrc - echo "build --config=remote" >> $HOME/.bazelrc - pip install --user yamllint -} - -travis_script() { - yamllint -c ../tools/project/yamllint.rc . - bazel test \ - //c-toxcore:license_test \ - //c-toxcore:readme_test - - # TODO(iphydf): Make tests have a chance to succeed. - # Run the tests, but if they fail, at least we should be able to build. - # bazel test //c-toxcore/... || bazel build //c-toxcore/... - bazel build //c-toxcore/... -} - -if [ "-z" "$ACTION" ]; then - "travis_script" -else - "travis_$ACTION" -fi