Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Cleanup #235

Merged
merged 1 commit into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# We use a docker image as the basis for our build, so that all the toolchains we use
# are already installed and the build can start running right away. It also guarantees
# the environment is portable and reproducible on your local machine.
var_1: &docker_image angular/ngcontainer:0.7.0
var_1: &docker_image angular/ngcontainer:0.8.0

# CircleCI lets us pick the key for storing one or more caches, to speed up subsequent builds.
# We can use this to avoid re-fetching our dependencies from npm on every build.
Expand All @@ -13,7 +13,7 @@ var_1: &docker_image angular/ngcontainer:0.7.0
# - the branch we are on, which really shouldn't be needed since the yarn lock file should be hermetic
# - the docker image tag, working around an issue we saw where changing docker images causes permission
# errors when restoring the cache, like when the user we run as changes
var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.7.0
var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.8.0

# Each job will inherit these defaults
anchor_1: &job_defaults
Expand Down
5 changes: 0 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package(default_visibility = ["//visibility:public"])

alias(
name = "install",
actual = "@nodejs//:yarn",
)

# ts_library and ng_module use the `//:tsconfig.json` target
# by default. This alias allows omitting explicit tsconfig
# attribute.
Expand Down
14 changes: 4 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ http_archive(
strip_prefix = "rules_sass-1.14.1",
)

# This local_repository rule is needed to prevent `bazel build ...` from
# drilling down into the @rxjs workspace BUILD files in node_modules/rxjs/src.
# In the future this will no longer be needed.
local_repository(
name = "ignore_node_modules_rxjs",
path = "node_modules/rxjs/src",
)

####################################
# Load and install our dependencies downloaded above.

Expand All @@ -67,8 +59,10 @@ rules_angular_dependencies()

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

# The minimum bazel version to use with this example repo is 0.17.1
check_bazel_version("0.17.1")
# The minimum bazel version to use with this example repo
# Bazel 0.19 supports the .bazelignore file
check_bazel_version("0.19.0")

node_repositories(
node_version = "10.9.0",
yarn_version = "1.9.2",
Expand Down