bazel
/
rules_pkg
mirror of https://github.com/bazelbuild/rules_pkg
2
0
Fork 0
Code Issues Releases Activity

Update to new stardoc so we can work with bzlmod. (#853) 

* Update to new stardoc so we can work with bzlmod.
* Requires update to merge.py to account for stardoc changes.
* put integration test back on bazel at head.

Fixes #808
This commit is contained in:
aiuto 2024-04-16 22:17:21 -04:00 committed by GitHub
parent 626de3ac59
commit 36433a92a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.bazelci/integration.yml
View File

@ -11,8 +11,4 @@ tasks:
integration: integration:
name: rolling_distro name: rolling_distro
platform: ubuntu1804 platform: ubuntu1804
# See https://github.com/bazelbuild/rules_pkg/issues/808
bazel: 7.0.0
build_flags:
- "--noenable_bzlmod"
<<: *common <<: *common

2
MODULE.bazel
View File

@ -12,8 +12,8 @@ bazel_dep(name = "bazel_skylib", version = "1.2.0")
# Only for development # Only for development
bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True) bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
bazel_dep(name = "stardoc", version = "0.5.3", dev_dependency = True)
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True)
# Find the system rpmbuild if one is available. # Find the system rpmbuild if one is available.
find_rpm = use_extension("//toolchains/rpm:rpmbuild_configure.bzl", "find_system_rpmbuild_bzlmod", dev_dependency = True) find_rpm = use_extension("//toolchains/rpm:rpmbuild_configure.bzl", "find_system_rpmbuild_bzlmod", dev_dependency = True)

2
doc_build/BUILD
View File

@ -20,7 +20,7 @@ How to:
""" """
load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@bazel_stardoc//stardoc:stardoc.bzl", "stardoc") load("@stardoc//stardoc:stardoc.bzl", "stardoc")
load("//:version.bzl", "version") load("//:version.bzl", "version")
package(default_applicable_licenses = ["//:license"]) package(default_applicable_licenses = ["//:license"])

7
doc_build/merge.py
View File

@ -23,7 +23,7 @@ import sys
import typing import typing
ID_RE = re.compile(r'<a id="#(.*)">') ID_RE = re.compile(r'<a id="(.*)">')
WRAPS_RE = re.compile(r'@wraps\((.*)\)') WRAPS_RE = re.compile(r'@wraps\((.*)\)')
SINCE_RE = re.compile(r'@since\(([^)]*)\)') SINCE_RE = re.compile(r'@since\(([^)]*)\)')
CENTER_RE = re.compile(r'<p align="center">([^<]*)</p>') CENTER_RE = re.compile(r'<p align="center">([^<]*)</p>')
@ -78,9 +78,10 @@ def main(argv: typing.Sequence[str]) -> None:
for file in argv[1:]: for file in argv[1:]:
merge_file(file, sys.stdout, wrapper_map) merge_file(file, sys.stdout, wrapper_map)
if wrapper_map: if wrapper_map:
print("We didn't use all the @wraps()", wrapper_map) print("We didn't use all the @wraps()", wrapper_map, file=sys.stderr)
sys.exit(1) sys.exit(1)
return 0
if __name__ == '__main__': if __name__ == '__main__':
main(sys.argv) sys.exit(main(sys.argv))