Skip to content

docs: Consolidate build rules #18142

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.

Sign up for GitHub

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

Merged
wrowe merged 2 commits into from
Sep 24, 2021
Merged

docs: Consolidate build rules #18142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2334967
docs: Consolidate build rules
phlax Sep 16, 2021
85aa312
add-todo
phlax Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,11 +686,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Packaging rules for Bazel",
project_desc = "Bazel rules for the packaging distributions",
project_url = "https://github.com/bazelbuild/rules_pkg",
version = "0.4.0",
sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
version = "0.5.1",
sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d",
urls = ["https://github.com/bazelbuild/rules_pkg/releases/download/{version}/rules_pkg-{version}.tar.gz"],
use_category = ["build"],
release_date = "2021-03-03",
release_date = "2021-08-18",
),
six = dict(
project_name = "Six",
Expand Down
88 changes: 42 additions & 46 deletions docs/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load(
"//bazel:envoy_build_system.bzl",
"envoy_package",
)
load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files")
load("@rules_pkg//:pkg.bzl", "pkg_tar")

licenses(["notice"]) # Apache 2
Expand Down Expand Up @@ -69,50 +70,6 @@ genrule(
],
)

pkg_tar(
name = "sphinx_base",
srcs = glob(
[
"conf.py",
"_ext/*",
],
) + [":redirects"],
extension = "tar",
strip_prefix = "/docs/",
)

pkg_tar(
name = "sphinx_root",
srcs = glob(["root/**/*"]),
extension = "tar",
strip_prefix = "/docs/root",
)

pkg_tar(
name = "base_rst",
extension = "tar",
deps = [
":sphinx_base.tar",
":sphinx_root.tar",
],
)

pkg_tar(
name = "google_vrp_config",
srcs = ["//configs:google-vrp/envoy-edge.yaml"],
extension = "tar",
package_dir = "/best_practices",
strip_prefix = "/configs/configuration",
)

pkg_tar(
name = "examples_rst",
srcs = ["//examples:files"],
extension = "tar",
package_dir = "/start/sandboxes/_include",
strip_prefix = "/examples",
)

genrule(
name = "extensions_security_rst",
srcs = [
Expand Down Expand Up @@ -171,14 +128,53 @@ genrule(
tools = ["//tools/docs:generate_api_rst"],
)

pkg_files(
name = "sphinx_base",
srcs = glob(
[
"conf.py",
"_ext/*",
],
) + [":redirects"],
strip_prefix = "/docs",
)

pkg_files(
name = "sphinx_root",
srcs = glob(["root/**/*"]),
strip_prefix = "/docs/root",
)

pkg_files(
Comment thread
wrowe marked this conversation as resolved.
Outdated
name = "google_vrp_config",
srcs = ["//configs:google-vrp/envoy-edge.yaml"],
prefix = "config/best_practices",
strip_prefix = "/configs",
)

pkg_files(
name = "examples_rst",
srcs = ["//examples:files"],
prefix = "start/sandboxes/_include",
strip_prefix = "/examples",
)

pkg_filegroup(
name = "rst_files",
srcs = [
":examples_rst",
":sphinx_base",
":sphinx_root",
],
)

pkg_tar(
name = "rst",
srcs = [":rst_files"],
extension = "tar",
deps = [
":api_rst",
":base_rst.tar",
":empty_protos_rst",
":examples_rst.tar",
":extensions_security_rst",
":external_deps_rst",
],
Expand Down