diff options
| author | Eugene Kliuchnikov <eustas@google.com> | 2017-06-22 11:38:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 11:38:49 +0200 |
| commit | efdff3f14e5857b08fb2e9d1b973e7d446d59507 (patch) | |
| tree | 0e92063a033afece24ca1de0593fbe692a7b1e7e | |
| parent | e51eae564f307d6b54b6a982f8ab5744da5a6fe6 (diff) | |
| download | brotli-efdff3f14e5857b08fb2e9d1b973e7d446d59507.zip brotli-efdff3f14e5857b08fb2e9d1b973e7d446d59507.tar.gz brotli-efdff3f14e5857b08fb2e9d1b973e7d446d59507.tar.bz2 | |
Fix linux-bazel build (#566)
Install bazel via apt-source
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | scripts/.travis.sh | 11 |
2 files changed, 4 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index fe05e44..73a7615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -235,10 +235,12 @@ matrix: addons: apt: sources: + - sourceline: "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" + key_url: "https://storage.googleapis.com/bazel-apt/doc/apt-key.pub.gpg" - ubuntu-toolchain-r-test packages: - - wget - - pkg-config + - oracle-java8-installer + - bazel - os: osx env: BUILD_SYSTEM=bazel diff --git a/scripts/.travis.sh b/scripts/.travis.sh index 5ca14f2..be9313e 100755 --- a/scripts/.travis.sh +++ b/scripts/.travis.sh @@ -2,17 +2,6 @@ case "$1" in "before_install") - case "${TRAVIS_OS_NAME}" in - "linux") - case "${BUILD_SYSTEM}" in - "bazel") - wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel_0.4.5-linux-x86_64.deb - echo 'b494d0a413e4703b6cd5312403bea4d92246d6425b3be68c9bfbeb8cc4db8a55 bazel_0.4.5-linux-x86_64.deb' | sha256sum -c --strict || exit 1 - sudo dpkg -i bazel_0.4.5-linux-x86_64.deb - ;; - esac - ;; - esac ;; "install") case "${TRAVIS_OS_NAME}" in |