From 40b62fd42c07ba8af4a4c9701ef386dd73c4912c Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Tue, 26 Feb 2019 15:00:47 -0800 Subject: [PATCH] upgrade nodejs bazel rules to version 0.26.0 Change-Id: Iee23d220e2cf2ca5d089ecf271f4a6ef8c9df3a8 --- .bazelrc | 5 ----- WORKSPACE | 6 +----- apps/faultmanagement/fm-gui2-lib/BUILD | 2 -- web/gui/BUILD | 2 -- web/gui2-fw-lib/BUILD | 3 --- web/gui2/BUILD | 2 -- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.bazelrc b/.bazelrc index 6c46951144..3bd81666ed 100644 --- a/.bazelrc +++ b/.bazelrc @@ -4,10 +4,5 @@ test --test_summary=terse test --test_output=errors test --test_verbose_timeout_warnings -# remove these when we upgrade nodejs rules -build --incompatible_disallow_data_transition=false -test --incompatible_disallow_data_transition=false -query --incompatible_disallow_data_transition=false - #build --disk_cache=~/bazel-cache #build --remote_http_cache=http://10.1.10.224:80/cache diff --git a/WORKSPACE b/WORKSPACE index 6d497469aa..0fe619dc0b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -85,13 +85,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( name = "build_bazel_rules_nodejs", remote = "https://github.com/bazelbuild/rules_nodejs.git", - tag = "0.11.5", # check for the latest tag when you install + tag = "0.26.0", # check for the latest tag when you install ) -load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies") - -rules_nodejs_dependencies() - load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") node_repositories( diff --git a/apps/faultmanagement/fm-gui2-lib/BUILD b/apps/faultmanagement/fm-gui2-lib/BUILD index ec403efc94..56e4888eff 100644 --- a/apps/faultmanagement/fm-gui2-lib/BUILD +++ b/apps/faultmanagement/fm-gui2-lib/BUILD @@ -73,7 +73,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", "//web/gui2-fw-lib:onos-gui2-fw-npm-install", @@ -130,7 +129,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", "//web/gui2-fw-lib:onos-gui2-fw-npm-install", diff --git a/web/gui/BUILD b/web/gui/BUILD index b142c5742e..ab4d98303f 100644 --- a/web/gui/BUILD +++ b/web/gui/BUILD @@ -96,7 +96,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", "//tools/gui:tools-gui-gulp", @@ -126,7 +125,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", ":_onos-gui-npm-install", diff --git a/web/gui2-fw-lib/BUILD b/web/gui2-fw-lib/BUILD index b47749b8f4..a3e2b2c3b6 100644 --- a/web/gui2-fw-lib/BUILD +++ b/web/gui2-fw-lib/BUILD @@ -170,7 +170,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", ":_root_level_files", @@ -205,7 +204,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", ":onos-gui2-fw-npm-install", @@ -254,7 +252,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", ":onos-gui2-fw-npm-install", diff --git a/web/gui2/BUILD b/web/gui2/BUILD index bd0b330094..2e6289508b 100644 --- a/web/gui2/BUILD +++ b/web/gui2/BUILD @@ -115,7 +115,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", "//web/gui2-fw-lib:onos-gui2-fw-npm-install", @@ -177,7 +176,6 @@ genrule( srcs = [ "@nodejs//:bin/npm", "@nodejs//:bin/node", - "@nodejs//:bin/node.js", "@nodejs//:bin/nodejs/bin/node", "@nodejs//:bin/nodejs/bin/npm", "//web/gui2-fw-lib:onos-gui2-fw-npm-install",