Remove dependency on rules_pkg from rules_cc

This helps with getting rules_cc back to green. The distro package doesn't seem critical and it can be added back in a later CL once we figure out what is wrong with the rules_pkg dependency.

RELNOTES:none
PiperOrigin-RevId: 401001290
Change-Id: I94304c7df3597c84633952fb6013bd074c350122
This commit is contained in:
Googler 2021-10-05 09:12:49 -07:00 committed by Copybara-Service
parent dd2758b96d
commit ddc0791fa6
6 changed files with 1 additions and 60 deletions

View File

@ -11,7 +11,6 @@ x_defaults:
- "//cc:all" - "//cc:all"
- "//cc/private/rules_impl:all" - "//cc/private/rules_impl:all"
- "//cc/private/toolchain:all" - "//cc/private/toolchain:all"
- "//distro:all"
- "//examples:all" - "//examples:all"
- "//examples/my_c_archive:all" - "//examples/my_c_archive:all"
- "//examples/my_c_compile:all" - "//examples/my_c_compile:all"
@ -25,7 +24,6 @@ x_defaults:
- "//cc:all" - "//cc:all"
- "//cc/private/rules_impl:all" - "//cc/private/rules_impl:all"
- "//cc/private/toolchain:all" - "//cc/private/toolchain:all"
- "//distro:all"
- "//examples:all" - "//examples:all"
- "//examples/my_c_archive:all" - "//examples/my_c_archive:all"
- "//examples/my_c_compile:all" - "//examples/my_c_compile:all"

View File

@ -2,19 +2,6 @@ workspace(name = "rules_cc")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "rules_pkg",
sha256 = "353b20e8b093d42dd16889c7f918750fb8701c485ac6cceb69a5236500507c27",
urls = [
"https://github.com/bazelbuild/rules_pkg/releases/download/0.5.0/rules_pkg-0.5.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.5.0/rules_pkg-0.5.0.tar.gz",
],
)
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
rules_pkg_dependencies()
http_archive( http_archive(
name = "bazel_federation", name = "bazel_federation",
sha256 = "0d6893f0d18f417a3324ce7f0ed2e6e5b825d6d5ab42f0f3d7877cb313f36453", sha256 = "0d6893f0d18f417a3324ce7f0ed2e6e5b825d6d5ab42f0f3d7877cb313f36453",

View File

@ -1,30 +0,0 @@
load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("@rules_pkg//releasing:defs.bzl", "print_rel_notes")
load("//cc:version.bzl", "version")
package(
default_visibility = ["//visibility:private"],
)
# Build the artifact to put on the github release page.
pkg_tar(
name = "rules_cc-%s" % version,
srcs = [
"//:distribution",
"//cc:distribution",
],
extension = "tar.gz",
# It is all source code, so make it read-only.
mode = "0444",
# Make it owned by root so it does not have the uid of the CI robot.
owner = "0.0",
package_dir = ".",
strip_prefix = ".",
)
print_rel_notes(
name = "relnotes",
outs = ["relnotes.txt"],
repo = "rules_cc",
version = version,
)

View File

@ -1,11 +0,0 @@
# Package rules_cc
```bash
bazel build :relnotes
cat ../bazel-bin/distro/relnotes.txt
tar tzf ../bazel-bin/distro/rules_cc-*.tar.gz
```
- Create a new release
- Copy/paste relnotes.txt into the notes. Adjust as needed.
- Upload the tar.gz file as an artifact.

View File

@ -14,7 +14,7 @@
"""Dependencies that are needed for rules_cc tests and tools.""" """Dependencies that are needed for rules_cc tests and tools."""
load("@bazel_federation//:repositories.bzl", "bazel_skylib", "protobuf", "rules_go", "rules_pkg", "rules_python") load("@bazel_federation//:repositories.bzl", "bazel_skylib", "protobuf", "rules_go", "rules_python")
load("@bazel_federation//:third_party_repositories.bzl", "abseil_py", "py_mock", "six", "zlib") load("@bazel_federation//:third_party_repositories.bzl", "abseil_py", "py_mock", "six", "zlib")
def rules_cc_internal_deps(): def rules_cc_internal_deps():
@ -22,7 +22,6 @@ def rules_cc_internal_deps():
bazel_skylib() bazel_skylib()
protobuf() protobuf()
rules_go() rules_go()
rules_pkg()
rules_python() rules_python()
abseil_py() abseil_py()

View File

@ -14,7 +14,6 @@
"""Setup for rules_cc tests and tools.""" """Setup for rules_cc tests and tools."""
load("@bazel_federation//setup:rules_pkg.bzl", "rules_pkg_setup")
load("@bazel_federation//setup:rules_python.bzl", "rules_python_setup") load("@bazel_federation//setup:rules_python.bzl", "rules_python_setup")
# TODO(fweikert): Add setup.bzl file for skylib to the federation and load it instead of workspace.bzl # TODO(fweikert): Add setup.bzl file for skylib to the federation and load it instead of workspace.bzl
@ -28,5 +27,4 @@ def rules_cc_internal_setup():
bazel_skylib_workspace() bazel_skylib_workspace()
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains() go_register_toolchains()
rules_pkg_setup()
rules_python_setup() rules_python_setup()