From e5b000638bf8a0a2400a9e8241126c19ce339df8 Mon Sep 17 00:00:00 2001 From: jianglai Date: Mon, 5 Feb 2018 09:09:14 -0800 Subject: [PATCH] Update FOSS bazel version to 0.10.0 Also changed version checker tuple from strings to ints, so that 0.10.0 is larger than 0.4.2. I think we should just get rid of the version checker all together. It is still requirement 0.4.2 as minimal bazel version, which mostly like will not work with Nomulus at this point. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=184536748 --- docs/install.md | 6 +++--- java/google/registry/repositories.bzl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/install.md b/docs/install.md index 31a5ee517..397cfadd8 100644 --- a/docs/install.md +++ b/docs/install.md @@ -7,8 +7,8 @@ This document covers the steps necessary to download, build, and deploy Nomulus. You will need the following programs installed on your local machine: * A recent version of the [Java 8 JDK][java-jdk8]. -* [Bazel build system](http://bazel.io/) (version [0.9.0][bazel-version] works - as of 2017-12-19). +* [Bazel build system](http://bazel.io/) (version [0.10.0][bazel-version] + works as of 2018-02-05). * [Google App Engine SDK for Java][app-engine-sdk], and configure aliases to to the `gcloud` and `appcfg.sh` utilities (you'll use them a lot). * [Git](https://git-scm.com/) version control system. @@ -181,4 +181,4 @@ See the [first steps tutorial](./first-steps-tutorial.md) for more information. [app-engine-sdk]: https://cloud.google.com/appengine/docs/java/download [java-jdk8]: http://www.oracle.com/technetwork/java/javase/downloads -[bazel-version]: https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh +[bazel-version]: https://github.com/bazelbuild/bazel/releases/download/0.10.0/bazel-0.10.0-installer-linux-x86_64.sh diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 80ad16047..1c515f550 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -2480,8 +2480,8 @@ def _parse_bazel_version(bazel_version): # Split into (release, date) parts and only return the release # as a tuple of integers. parts = version.split("-", 1) - # Turn "release" into a tuple of strings + # Turn "release" into a tuple of ints. version_tuple = () for number in parts[0].split("."): - version_tuple += (str(number),) + version_tuple += (int(number),) return version_tuple