From 0bc1edd4c4b1b592b9d4e3b4e38301ddd77a1913 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Tue, 22 Nov 2022 14:39:02 -0500 Subject: Add dev dependency on rules_pkg. - remove from WORKSPACE.bzlmod - build distro with bzlmod --- .bazelci/tests.yml | 3 +++ MODULE.bazel | 7 +++++-- WORKSPACE.bzlmod | 15 --------------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.bazelci/tests.yml b/.bazelci/tests.yml index 153a9b4..68fc0ae 100644 --- a/.bazelci/tests.yml +++ b/.bazelci/tests.yml @@ -74,3 +74,6 @@ tasks: <<: *rolling build_flags: - "--enable_bzlmod" + build_targets: + - "//distro:distro" + - "//distro:relnotes" diff --git a/MODULE.bazel b/MODULE.bazel index 80a9f62..a7d09f7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -4,9 +4,12 @@ module( compatibility_level = 1, ) -# Note: rules_license must not depend on any other repositories if you are -# just using basic rules under //rules/... and //licenses. +# NOTE: rules_license must not depend on any other repositories if you are +# just using basic rules under //rules/... and //licenses/... # TODO(aiuto): Create an extension to enable the rules under //tools/... # That will require rules_python, which we do not want to force on people who # do not need //tools. + +# Only for development +bazel_dep(name = "rules_pkg", version = "0.7.0", dev_dependency = True) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 9cb942a..62e4ed8 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -9,18 +9,3 @@ maybe( strip_prefix = "rules_python-0.12.0", url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.12.0.tar.gz", ) - -# This is only needed to make small distributions. -maybe( - http_archive, - name = "rules_pkg", - sha256 = "eea0f59c28a9241156a47d7a8e32db9122f3d50b505fae0f33de6ce4d9b61834", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz", - ], -) - -load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") - -rules_pkg_dependencies() -- cgit v1.2.3