Skip to content

Commit 8434794

Browse files
committed
Revert "build: update Bazel to 0.16 (angular#25316)" (angular#25391)
This reverts commit 4eb8ac6 because 0.16 is not widely available yet (e.g. on Mac) and it is blocking the Angular release. PR Close angular#25391
1 parent 732026c commit 8434794

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
## IMPORTANT
1313
# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
1414
# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
15-
var_1: &docker_image angular/ngcontainer:0.4.0
16-
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.4.0
15+
var_1: &docker_image angular/ngcontainer:0.3.3
16+
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.3
1717

1818
# Define common ENV vars
1919
var_3: &define_env_vars

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ local_repository(
100100

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

103-
check_bazel_version("0.16.0")
103+
check_bazel_version("0.15.0")
104104
node_repositories(
105105
package_json = ["//:package.json"],
106106
preserve_symlinks = True,

integration/bazel/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ local_repository(
6565

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

68-
check_bazel_version("0.16.0")
68+
check_bazel_version("0.15.0")
6969
node_repositories(package_json = ["//:package.json"])
7070

7171
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

tools/ngcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
1919
###
2020
# Bazel install
2121
# See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
22-
RUN BAZEL_VERSION="0.16.0" \
22+
RUN BAZEL_VERSION="0.15.0" \
2323
&& wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
2424
&& echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
2525
&& apt-get update \

tools/ngcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
66
- npm 5.5.1
77
- yarn 1.3.2
88
- Java 8 (for Closure Compiler and Bazel)
9-
- Bazel build tool v0.16.0 - http://bazel.build
9+
- Bazel build tool v0.15.0 - http://bazel.build
1010
- Google Chrome 63.0.3239.84
1111
- Mozilla Firefox 47.0.1
1212
- xvfb (virtual framebuffer) for headless testing

0 commit comments

Comments
 (0)