From fa81c8eeb32f06ee94e834b827ac1716ba65074b Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 12 Jun 2017 16:03:47 -0700 Subject: [PATCH] ci: use npm_install for bazel using yarn_install polluted our node_modules cache because it disregards the npm_shrinkwrap.json --- .circleci/config.yml | 2 +- WORKSPACE | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 913e9781f3..cfd1edaff6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/ng docker: - - image: alexeagle/ngcontainer + - image: angular/ngcontainer steps: - checkout - restore_cache: diff --git a/WORKSPACE b/WORKSPACE index 7257bff005..c5e17f355b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,10 +3,10 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( name = "io_bazel_rules_typescript", remote = "https://github.com/bazelbuild/rules_typescript.git", - tag = "0.0.3", + commit = "804c5da", ) -load("@io_bazel_rules_typescript//:defs.bzl", "node_repositories", "yarn_install") +load("@io_bazel_rules_typescript//:defs.bzl", "node_repositories", "npm_install") node_repositories() -yarn_install(package_json = "//:package.json") +npm_install(package_json = "//:package.json")