Skip to content

Commit d70f493

Browse files
authored
1 parent f5916ee commit d70f493

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jdk:
1717
install:
1818
- export PATH=$PATH:$HOME/bin && mkdir -p $HOME/bin
1919
- wget https://github.com/bazelbuild/buildtools/releases/download/0.22.0/buildifier && chmod +x buildifier && mv buildifier $HOME/bin/
20-
- wget https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel-0.24.0-linux-x86_64 && mv bazel-0.24.0-linux-x86_64 bazel && chmod +x bazel && mv bazel $HOME/bin/
20+
- wget https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-linux-x86_64 && mv bazel-0.28.1-linux-x86_64 bazel && chmod +x bazel && mv bazel $HOME/bin/
2121
- sudo pip install pylint
2222

2323
script:

WORKSPACE

+9-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
55

66
http_archive(
77
name = "io_bazel_rules_go",
8-
sha256 = "7be7dc01f1e0afdba6c8eb2b43d2fa01c743be1b9273ab1eaf6c233df078d705",
9-
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.16.5/rules_go-0.16.5.tar.gz"],
8+
sha256 = "8df59f11fb697743cbb3f26cfb8750395f30471e9eabde0d174c3aebc7a1cd39",
9+
urls = [
10+
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.19.1/rules_go-0.19.1.tar.gz",
11+
"https://github.com/bazelbuild/rules_go/releases/download/0.19.1/rules_go-0.19.1.tar.gz",
12+
],
1013
)
1114

12-
load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
15+
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
1316

1417
go_rules_dependencies()
1518

@@ -194,9 +197,9 @@ http_file(
194197
# Docker rules.
195198
http_archive(
196199
name = "io_bazel_rules_docker",
197-
sha256 = "3556d4972571f288f8c43378295d84ed64fef5b1a875211ee1046f9f6b4258fa",
198-
strip_prefix = "rules_docker-0.8.0",
199-
urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.8.0.tar.gz"],
200+
sha256 = "87fc6a2b128147a0a3039a2fd0b53cc1f2ed5adb8716f50756544a572999ae9a",
201+
strip_prefix = "rules_docker-0.8.1",
202+
urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.8.1.tar.gz"],
200203
)
201204

202205
load(

package_manager/parse_metadata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
def parse_package_metadata(data, mirror_url, snapshot, package_prefix):
2323
""" Takes a debian package list, changes the relative urls to absolute urls,
2424
and saves the resulting metadata as a json file """
25-
raw_entries = [line.decode('utf-8').rstrip() for line in data.splitlines()]
25+
raw_entries = [line.rstrip() for line in data.splitlines()]
2626
parsed_entries = {}
2727
current_key = None
2828
current_entry = {}

test.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ set -e
1818

1919
# Linting
2020
./buildifier.sh
21-
find . -name "*.py" |xargs pylint --disable=R,C
21+
find . -name "*.py" | xargs pylint --disable=R,C
2222

2323
# Bazel build and test
24-
bazel clean --curses=no
25-
bazel build --curses=no //...
26-
bazel test --curses=no --test_output=errors //...
24+
bazel clean --host_force_python=PY2 --curses=no
25+
bazel build --host_force_python=PY2 --curses=no //...
26+
bazel test --host_force_python=PY2 --curses=no --test_output=errors //...

0 commit comments

Comments
 (0)