Skip to content

Commit

Permalink
Remove dependency on rules_pkg from rules_cc
Browse files Browse the repository at this point in the history
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
  • Loading branch information
oquenchil authored and copybara-github committed Oct 5, 2021
1 parent dd2758b commit ddc0791
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 60 deletions.
2 changes: 0 additions & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ x_defaults:
- "//cc:all"
- "//cc/private/rules_impl:all"
- "//cc/private/toolchain:all"
- "//distro:all"
- "//examples:all"
- "//examples/my_c_archive:all"
- "//examples/my_c_compile:all"
Expand All @@ -25,7 +24,6 @@ x_defaults:
- "//cc:all"
- "//cc/private/rules_impl:all"
- "//cc/private/toolchain:all"
- "//distro:all"
- "//examples:all"
- "//examples/my_c_archive:all"
- "//examples/my_c_compile:all"
Expand Down
13 changes: 0 additions & 13 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@ workspace(name = "rules_cc")

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(
name = "bazel_federation",
sha256 = "0d6893f0d18f417a3324ce7f0ed2e6e5b825d6d5ab42f0f3d7877cb313f36453",
Expand Down
30 changes: 0 additions & 30 deletions distro/BUILD.bazel

This file was deleted.

11 changes: 0 additions & 11 deletions distro/README.md

This file was deleted.

3 changes: 1 addition & 2 deletions internal_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

"""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")

def rules_cc_internal_deps():
"""Fetches all dependencies for rules_cc tests and tools."""
bazel_skylib()
protobuf()
rules_go()
rules_pkg()
rules_python()

abseil_py()
Expand Down
2 changes: 0 additions & 2 deletions internal_setup.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

"""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")

# TODO(fweikert): Add setup.bzl file for skylib to the federation and load it instead of workspace.bzl
Expand All @@ -28,5 +27,4 @@ def rules_cc_internal_setup():
bazel_skylib_workspace()
go_rules_dependencies()
go_register_toolchains()
rules_pkg_setup()
rules_python_setup()

0 comments on commit ddc0791

Please sign in to comment.