Skip to content

Commit

Permalink
Revert "build: update Bazel to 0.16 (angular#25316)"
Browse files Browse the repository at this point in the history
This reverts commit 4eb8ac6 because 0.16 is not
widely available yet (e.g. on Mac) and it is blocking the Angular release.
  • Loading branch information
kara committed Aug 8, 2018
1 parent 732026c commit 56a1b16
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -12,8 +12,8 @@
## IMPORTANT
# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
var_1: &docker_image angular/ngcontainer:0.4.0
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.4.0
var_1: &docker_image angular/ngcontainer:0.3.3
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.3

# Define common ENV vars
var_3: &define_env_vars
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Expand Up @@ -100,7 +100,7 @@ local_repository(

load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")

check_bazel_version("0.16.0")
check_bazel_version("0.15.0")
node_repositories(
package_json = ["//:package.json"],
preserve_symlinks = True,
Expand Down
2 changes: 1 addition & 1 deletion integration/bazel/WORKSPACE
Expand Up @@ -65,7 +65,7 @@ local_repository(

load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")

check_bazel_version("0.16.0")
check_bazel_version("0.15.0")
node_repositories(package_json = ["//:package.json"])

load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
Expand Down
2 changes: 1 addition & 1 deletion tools/ngcontainer/Dockerfile
Expand Up @@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
###
# Bazel install
# See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
RUN BAZEL_VERSION="0.16.0" \
RUN BAZEL_VERSION="0.15.0" \
&& wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
&& echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion tools/ngcontainer/README.md
Expand Up @@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
- npm 5.5.1
- yarn 1.3.2
- Java 8 (for Closure Compiler and Bazel)
- Bazel build tool v0.16.0 - http://bazel.build
- Bazel build tool v0.15.0 - http://bazel.build
- Google Chrome 63.0.3239.84
- Mozilla Firefox 47.0.1
- xvfb (virtual framebuffer) for headless testing
Expand Down

0 comments on commit 56a1b16

Please sign in to comment.