cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: update bazel to 0.13 (#23623)

Browse Source 
PR Close #23623
This commit is contained in:
Alex Eagle 2018-04-30 12:48:24 -07:00 committed by Igor Minar
parent 07f2098655
commit bbc416cdcd
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -12,8 +12,8 @@
## IMPORTANT ## IMPORTANT
# If you change the `docker_image` version, also change the `cache_key` suffix and the version of # 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. # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
var_1: &docker_image angular/ngcontainer:0.2.0 var_1: &docker_image angular/ngcontainer:0.3.0
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.2.0 var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.0
# Define common ENV vars # Define common ENV vars
var_3: &define_env_vars var_3: &define_env_vars

12
WORKSPACE
View File

@ -9,7 +9,7 @@ http_archive(
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
check_bazel_version("0.11.1") check_bazel_version("0.13.0")
node_repositories(package_json = ["//:package.json"]) node_repositories(package_json = ["//:package.json"])
yarn_install( yarn_install(
@ -44,13 +44,13 @@ local_repository(
# This commit matches the version of buildifier in angular/ngcontainer # This commit matches the version of buildifier in angular/ngcontainer
# If you change this, also check if it matches the version in the angular/ngcontainer # If you change this, also check if it matches the version in the angular/ngcontainer
# version in /.circleci/config.yml # version in /.circleci/config.yml
BAZEL_BUILDTOOLS_VERSION = "70bc7843bb9950fece2bc014ed16de03419e36e2" BAZEL_BUILDTOOLS_VERSION = "fd9878fd5de921e0bbab3dcdcb932c2627812ee1"
http_archive( http_archive(
name = "com_github_bazelbuild_buildtools", name = "com_github_bazelbuild_buildtools",
url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION, url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION, strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
sha256 = "367c23a5fe7fc2a7cb57863d3718b4149f0e57426c48c8ad54c45348a0b53cc1", sha256 = "27bb461ade23fd44ba98723ad98f84ee9c83cd3540b773b186a1bc5037f3d862",
) )
http_archive( http_archive(
@ -68,9 +68,9 @@ go_register_toolchains()
# Fetching the Bazel source code allows us to compile the Skylark linter # Fetching the Bazel source code allows us to compile the Skylark linter
http_archive( http_archive(
name = "io_bazel", name = "io_bazel",
url = "https://github.com/bazelbuild/bazel/archive/5a35e72f9e97c06540c479f8c31512fb4656202f.zip", url = "https://github.com/bazelbuild/bazel/archive/968f87900dce45a7af749a965b72dbac51b176b3.zip",
strip_prefix = "bazel-5a35e72f9e97c06540c479f8c31512fb4656202f", strip_prefix = "bazel-968f87900dce45a7af749a965b72dbac51b176b3",
sha256 = "ed33a52874c14e3b487fb50f390c541fab9c81a33d986d38fb01766a66dbcd21", sha256 = "e373d2ae24955c1254c495c9c421c009d88966565c35e4e8444c082cb1f0f48f",
) )
# We have a source dependency on the Devkit repository, because it's built with # We have a source dependency on the Devkit repository, because it's built with

2
tools/ngcontainer/Dockerfile
View File

@ -19,7 +19,7 @@ RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
### ###
# Bazel install # Bazel install
# See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended # See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
RUN BAZEL_VERSION="0.11.1" \ RUN BAZEL_VERSION="0.13.0" \
&& wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \ && 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 \ && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
&& apt-get update \ && apt-get update \

2
tools/ngcontainer/README.md
View File

@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
- npm 5.5.1 - npm 5.5.1
- yarn 1.3.2 - yarn 1.3.2
- Java 8 (for Closure Compiler and Bazel) - Java 8 (for Closure Compiler and Bazel)
- Bazel build tool v0.11.1 - http://bazel.build - Bazel build tool v0.13.0 - http://bazel.build
- Google Chrome 63.0.3239.84 - Google Chrome 63.0.3239.84
- Mozilla Firefox 47.0.1 - Mozilla Firefox 47.0.1
- xvfb (virtual framebuffer) for headless testing - xvfb (virtual framebuffer) for headless testing