Skip to content

Commit

Permalink
Merge pull request #139 from dibenede/prepare-release
Browse files Browse the repository at this point in the history
Prepare release
  • Loading branch information
lukesandberg authored Oct 7, 2022
2 parents 828d150 + f6d56c9 commit b792840
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "com_google_protobuf",
strip_prefix = "protobuf-21.0-rc1",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.0-rc1.zip"],
strip_prefix = "protobuf-21.3",
urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.3.zip"],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "google-protobuf",
"version": "3.21.0",
"version": "3.21.1",
"description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js",
"files": [
Expand Down
25 changes: 13 additions & 12 deletions protobuf_javascript_release.bzl
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"""
Generates package naming variables for use with rules_pkg.
"""
"""Generates package naming variables for use with rules_pkg."""

load("@rules_pkg//:providers.bzl", "PackageVariablesInfo")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")

_PROTOBUF_JAVASCRIPT_VERSION = '3.21.0'
_PROTOBUF_JAVASCRIPT_VERSION = "3.21.1"


def _package_naming_impl(ctx):
values = {}
Expand Down Expand Up @@ -37,15 +36,17 @@ def _package_naming_impl(ctx):
else:
values["platform"] = "unknown"

return PackageVariablesInfo(values = values)
return PackageVariablesInfo(values=values)


package_naming = rule(
implementation = _package_naming_impl,
attrs = {
# Necessary data dependency for find_cpp_toolchain.
"_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
implementation=_package_naming_impl,
attrs={
# Necessary data dependency for find_cpp_toolchain.
"_cc_toolchain":
attr.label(
default=Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
},
toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
incompatible_use_toolchain_transition = True,
)
toolchains=["@bazel_tools//tools/cpp:toolchain_type"],
incompatible_use_toolchain_transition=True,
)

0 comments on commit b792840

Please sign in to comment.