Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update rules_nodejs to v0.31.1 #3805

Merged
merged 1 commit into from Jun 11, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelignore
@@ -0,0 +1 @@
node_modules
2 changes: 1 addition & 1 deletion .bazelminversion
@@ -1 +1 @@
0.25.1
0.26.0
3 changes: 3 additions & 0 deletions .bazelrc
Expand Up @@ -5,6 +5,9 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
build --incompatible_require_ctx_in_configure_features # remove in 0.26
build --incompatible_string_join_requires_strings # remove in 0.27

# Required for build_bazel_rules_nodejs
common --experimental_allow_incremental_repository_updates

build --workspace_status_command tools/buildstamp/get_workspace_status
build --auto_cpu_environment_group=//buildenv:cpu

Expand Down
8 changes: 4 additions & 4 deletions WORKSPACE
@@ -1,4 +1,7 @@
workspace(name = "io_kythe")
workspace(
name = "io_kythe",
managed_directories = {"@npm": ["node_modules"]},
)

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
Expand Down Expand Up @@ -44,9 +47,6 @@ load("//tools/build_rules/external_tools:external_tools_configure.bzl", "externa
external_tools_configure()

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

node_repositories(package_json = ["//:package.json"])

npm_install(
name = "npm",
Expand Down
2 changes: 0 additions & 2 deletions external.bzl
@@ -1,7 +1,6 @@
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@io_kythe//:setup.bzl", "maybe")
load("@io_kythe//tools:build_rules/shims.bzl", "go_repository")
Expand All @@ -13,7 +12,6 @@ def _rule_dependencies():
gazelle_dependencies()
go_rules_dependencies()
go_register_toolchains()
rules_nodejs_dependencies()

def _cc_dependencies():
maybe(
Expand Down
6 changes: 3 additions & 3 deletions setup.bzl
Expand Up @@ -26,8 +26,8 @@ def kythe_rule_repositories():
)

maybe(
git_repository,
http_archive,
name = "build_bazel_rules_nodejs",
remote = "https://github.com/bazelbuild/rules_nodejs.git",
tag = "0.16.2",
sha256 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"],
)
2 changes: 1 addition & 1 deletion tools/git/BUILD
Expand Up @@ -6,7 +6,7 @@ nodejs_binary(
"@npm//node_modules/@commitlint/cli:cli__pkg",
"@npm//node_modules/@commitlint/config-conventional:config-conventional__pkg",
],
entry_point = "@commitlint/cli/lib/cli.js",
entry_point = "@npm//node_modules/@commitlint/cli:lib/cli.js",
schroederc marked this conversation as resolved.
Show resolved Hide resolved
install_source_map_support = False,
tags = ["manual"],
visibility = ["//visibility:public"],
Expand Down
5 changes: 2 additions & 3 deletions version.bzl
@@ -1,6 +1,5 @@
# Minimum supported Bazel version. Should match .bazelminversion file and
# https://buildkite.com/kythe-project/bazel-minimum/settings.
MIN_VERSION = "0.25.1"
# Minimum supported Bazel version. Should match .bazelminversion file.
MIN_VERSION = "0.26.0"

# Maximum supported Bazel version. Should match .bazelversion file.
MAX_VERSION = "0.26.1"
Expand Down