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

ci: update to bazel 0.17 (#25967)

Browse Source 
this includes support for @ character in labels, which we need for fine-grained deps

PR Close #25967
This commit is contained in:
Alex Eagle 2018-09-14 09:48:55 -07:00 committed by Ben Lesh
parent 2e32d4ee17
commit bdbb2f9bfa
8 changed files with 12 additions and 8 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.5.0 var_1: &docker_image angular/ngcontainer:0.6.0
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.5.0 var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.6.0
# Define common ENV vars # Define common ENV vars
var_3: &define_env_vars var_3: &define_env_vars

8
WORKSPACE
View File

@ -51,9 +51,9 @@ http_archive(
# 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/968f87900dce45a7af749a965b72dbac51b176b3.zip", url = "https://github.com/bazelbuild/bazel/archive/0.17.1.zip",
strip_prefix = "bazel-968f87900dce45a7af749a965b72dbac51b176b3", strip_prefix = "bazel-0.17.1",
sha256 = "e373d2ae24955c1254c495c9c421c009d88966565c35e4e8444c082cb1f0f48f", sha256 = "ace8cced3b21e64a8fdad68508e9b0644201ec848ad583651719841d567fc66d",
) )
http_archive( http_archive(
@ -106,7 +106,7 @@ local_repository(
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories") load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
check_bazel_version("0.16.0", """ check_bazel_version("0.17.0", """
If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16 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 See https://blog.bazel.build/2018/08/22/bazel-homebrew.html

2
integration/bazel/WORKSPACE
View File

@ -37,7 +37,7 @@ local_repository(
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories") load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
check_bazel_version("0.16.0") check_bazel_version("0.17.0")
node_repositories( node_repositories(
package_json = ["//:package.json"], package_json = ["//:package.json"],
node_version = "10.9.0", node_version = "10.9.0",

1
packages/compiler-cli/test/BUILD.bazel
View File

@ -65,6 +65,7 @@ ts_library(
jasmine_node_test( jasmine_node_test(
name = "ngc", name = "ngc",
timeout = "long", # 900 seconds
bootstrap = ["angular/tools/testing/init_node_spec.js"], bootstrap = ["angular/tools/testing/init_node_spec.js"],
data = [ data = [
"//packages/common:npm_package", "//packages/common:npm_package",

1
packages/compiler-cli/test/diagnostics/BUILD.bazel
View File

@ -30,6 +30,7 @@ ts_library(
jasmine_node_test( jasmine_node_test(
name = "check_types", name = "check_types",
timeout = "long", # 900 seconds
bootstrap = ["angular/tools/testing/init_node_spec.js"], bootstrap = ["angular/tools/testing/init_node_spec.js"],
data = [ data = [
"//packages/common:npm_package", "//packages/common:npm_package",

1
packages/compiler-cli/test/transformers/BUILD.bazel
View File

@ -18,6 +18,7 @@ ts_library(
jasmine_node_test( jasmine_node_test(
name = "test", name = "test",
timeout = "long", # 900 seconds
bootstrap = ["angular/tools/testing/init_node_spec.js"], bootstrap = ["angular/tools/testing/init_node_spec.js"],
data = [ data = [
"//packages/common:npm_package", "//packages/common:npm_package",

1
tools/ngcontainer/Dockerfile
View File

@ -5,6 +5,7 @@ USER root
### ###
# 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
# Note, only the latest release is available, see https://github.com/bazelbuild/bazel/issues/4947
RUN BAZEL_VERSION="0.17.1" \ RUN BAZEL_VERSION="0.17.1" \
&& 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 \

2
tools/ngcontainer/README.md
View File

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