Skip to content

Commit 214f2bb

Browse files
Merge pull request #260 from ruuda/bazel025
Fix build for Bazel 0.25 and later
2 parents 0b78c7c + d5545ad commit 214f2bb

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ case "$1" in
1515
case "${TRAVIS_OS_NAME}" in
1616
"linux")
1717
sudo apt-get remove openjdk-9-jdk oracle-java9-installer # Conflicts with Bazel.
18-
wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel_0.4.5-linux-x86_64.deb
19-
echo 'b494d0a413e4703b6cd5312403bea4d92246d6425b3be68c9bfbeb8cc4db8a55 bazel_0.4.5-linux-x86_64.deb' | sha256sum -c --strict || exit 1
20-
sudo dpkg -i bazel_0.4.5-linux-x86_64.deb
18+
wget https://github.com/bazelbuild/bazel/releases/download/1.1.0/bazel_1.1.0-linux-x86_64.deb
19+
echo '138b47ffd54924e3c0264c65d31d3927803fb9025db4d5b18107df79ee3bda95 bazel_1.1.0-linux-x86_64.deb' | sha256sum -c --strict || exit 1
20+
sudo dpkg -i bazel_1.1.0-linux-x86_64.deb
2121
;;
2222
"osx")
23+
brew cask install homebrew/cask-versions/adoptopenjdk8
2324
brew install bazel
2425
;;
2526
esac

WORKSPACE

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33

44
workspace(name = "guetzli")
55

6-
new_http_archive(
6+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
7+
8+
http_archive(
79
name = "png_archive",
810
build_file = "png.BUILD",
911
sha256 = "a941dc09ca00148fe7aaf4ecdd6a67579c293678ed1e1cf633b5ffc02f4f8cf7",
1012
strip_prefix = "libpng-1.2.57",
1113
url = "http://github.com/glennrp/libpng/archive/v1.2.57.zip",
1214
)
1315

14-
new_http_archive(
16+
http_archive(
1517
name = "zlib_archive",
1618
build_file = "zlib.BUILD",
1719
sha256 = "8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017",

png.BUILD external/png.BUILD

File renamed without changes.

zlib.BUILD external/zlib.BUILD

File renamed without changes.

0 commit comments

Comments
 (0)