diff options
| author | Blaze Rules Copybara <blaze-rules@google.com> | 2023-06-12 11:39:58 -0700 |
|---|---|---|
| committer | Blaze Rules Copybara <blaze-rules@google.com> | 2023-06-12 11:39:59 -0700 |
| commit | 61968e3bdf64de4a236c3d21ea503a6d7756966d (patch) | |
| tree | d9ee04772197564826046bf31514ce607fa3dbf9 | |
| parent | b803b1842f2be953c650f8ddf3259e4c9b165ad9 (diff) | |
| parent | 3de2612f53ddb6f3cd14263951515b7161249329 (diff) | |
| download | bazelbuild-rules_testing-61968e3bdf64de4a236c3d21ea503a6d7756966d.tar.gz | |
Merge pull request #40 from rickeylev:stardoc.bzlmod
PiperOrigin-RevId: 539715930
| -rw-r--r-- | .bazelci/presubmit.yml | 12 | ||||
| -rw-r--r-- | MODULE.bazel | 2 | ||||
| -rw-r--r-- | docgen/BUILD | 1 | ||||
| -rw-r--r-- | docgen/docgen.bzl | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 2ea8c13..8bf06bb 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -16,10 +16,20 @@ tasks: bazel: latest test_flags: - "--enable_bzlmod" - - "--test_tag_filters=-skip-bzlmod" + - "--test_tag_filters=-skip-bzlmod,-docs" test_targets: - "..." + docs: + name: Docs generation + platform: ubuntu2004 + bazel: latest + test_flags: + - "--enable_bzlmod" + test_targets: + - "//docgen/..." + - "//docs/..." + e2e_bzlmod: platform: ${{platform}} working_directory: e2e/bzlmod diff --git a/MODULE.bazel b/MODULE.bazel index b24c509..f4e843b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -14,7 +14,7 @@ bazel_dep(name = "rules_license", version = "0.0.4") # work with bzlmod enabled. This defines the repo so load() works. bazel_dep( name = "stardoc", - version = "0.5.3", + version = "0.5.6", dev_dependency = True, repo_name = "io_bazel_stardoc", ) diff --git a/docgen/BUILD b/docgen/BUILD index 3acaa53..774964a 100644 --- a/docgen/BUILD +++ b/docgen/BUILD @@ -45,4 +45,5 @@ sphinx_stardocs( "//lib/private:str_subject_bzl", "//lib/private:target_subject_bzl", ], + tags = ["docs"], ) diff --git a/docgen/docgen.bzl b/docgen/docgen.bzl index f89328a..1aa2a0f 100644 --- a/docgen/docgen.bzl +++ b/docgen/docgen.bzl @@ -29,11 +29,6 @@ def sphinx_stardocs(name, bzl_libraries, **kwargs): tags) """ - # Stardoc doesn't yet work with bzlmod; we can detect this by - # looking for "@@" vs "@" in labels. - if "@@" in str(Label("//:X")): - kwargs["target_compatible_with"] = ["@platforms//:incompatible"] - docs = [] for label in bzl_libraries: lib_name = Label(label).name.replace("_bzl", "") |