diff --git a/.circleci/config.yml b/.circleci/config.yml index f936f29bde3703..e951c4bb80d395 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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.3.3 -var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.3 +var_1: &docker_image angular/ngcontainer:0.4.0 +var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.4.0 # Define common ENV vars var_3: &define_env_vars diff --git a/WORKSPACE b/WORKSPACE index 1157b2e1949d85..d096fba2bb3277 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,6 +3,12 @@ workspace(name = "angular") # # Download Bazel toolchain dependencies as needed by build actions # +http_archive( + name = "build_bazel_rules_nodejs", + urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.12.0.zip"], + strip_prefix = "rules_nodejs-0.12.0", + sha256 = "2977cdbc8ae0eed7d4186385af56a50a3321a549e2136a959998bba89d2edb6e", +) http_archive( name = "build_bazel_rules_typescript", @@ -100,7 +106,11 @@ local_repository( load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") -check_bazel_version("0.15.0") +check_bazel_version("0.16.0", """ +If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16 +See https://blog.bazel.build/2018/08/22/bazel-homebrew.html + +""") node_repositories( package_json = ["//:package.json"], preserve_symlinks = True, diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 4d1148c747b56d..b7cf1fa15c805b 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -38,7 +38,7 @@ local_repository( load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories") -check_bazel_version("0.15.0") +check_bazel_version("0.16.0") node_repositories(package_json = ["//:package.json"]) load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains") diff --git a/tools/ngcontainer/Dockerfile b/tools/ngcontainer/Dockerfile index 273d28f485b641..14d9e6a80f29a0 100644 --- a/tools/ngcontainer/Dockerfile +++ b/tools/ngcontainer/Dockerfile @@ -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.15.0" \ +RUN BAZEL_VERSION="0.16.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 \ diff --git a/tools/ngcontainer/README.md b/tools/ngcontainer/README.md index 1fef76f2569383..8ec1f8f11494b6 100644 --- a/tools/ngcontainer/README.md +++ b/tools/ngcontainer/README.md @@ -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.15.0 - http://bazel.build +- Bazel build tool v0.16.0 - http://bazel.build - Google Chrome 63.0.3239.84 - Mozilla Firefox 47.0.1 - xvfb (virtual framebuffer) for headless testing