From e032cbb7c806bb26744bdee52cb1cbd906652eab Mon Sep 17 00:00:00 2001 From: 5h4d0w4rt <5h4d0w4rt@gmail.com> Date: Sat, 30 Oct 2021 19:17:49 +0500 Subject: [PATCH] move stardoc to remote callers --- .github/workflows/main.yml | 4 ++-- WORKSPACE | 16 ++++------------ prometheus/internal/repositories.bzl | 9 +++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 972612a..01684e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,9 +6,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] + branches: [ main, pull_request ] pull_request: - branches: [ main ] + branches: [ main, pull_request ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/WORKSPACE b/WORKSPACE index 468f872..8de8b8b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,7 +1,6 @@ workspace(name = "io_bazel_rules_prometheus") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") http_archive( name = "platforms", @@ -21,17 +20,6 @@ http_archive( ], ) -git_repository( - name = "io_bazel_stardoc", - commit = "4378e9b6bb2831de7143580594782f538f461180", - remote = "https://github.com/bazelbuild/stardoc.git", - shallow_since = "1570829166 -0400", -) - -load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories") - -stardoc_repositories() - load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() @@ -39,3 +27,7 @@ bazel_skylib_workspace() load("@io_bazel_rules_prometheus//:deps.bzl", "prometheus_repositories") prometheus_repositories() + +load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories") + +stardoc_repositories() diff --git a/prometheus/internal/repositories.bzl b/prometheus/internal/repositories.bzl index dcd23bb..7c95148 100644 --- a/prometheus/internal/repositories.bzl +++ b/prometheus/internal/repositories.bzl @@ -1,4 +1,5 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load(":toolchain.bzl", "build_toolchains", "prometheus_register_toolchains") load(":platforms.bzl", "PLATFORMS") @@ -193,6 +194,14 @@ def prometheus_repositories( _platforms_info: pre-built PrometheusPlatformInfo provider with info on all available os+architectures """ + # required to build docs on downstream callers + git_repository( + name = "io_bazel_stardoc", + commit = "4378e9b6bb2831de7143580594782f538f461180", + remote = "https://github.com/bazelbuild/stardoc.git", + shallow_since = "1570829166 -0400", + ) + # TODO(5h4d0w4rt) add custom version support prometheus_package_info = PrometheusPackageInfo( platforms_info = _platforms_info,