Merge branch 'bazelbuild:main' into active-03-additional-defines

bazelbuild · Dec 21, 2023 · 2f85464 · 2f85464
2 parents e02ff61 + eaa1b45
commit 2f85464
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.bazelci/tests.yml b/.bazelci/tests.yml
@@ -120,7 +120,7 @@ tasks:
     build_targets:
       - "//distro:distro"
       - "//distro:relnotes"
-      - "//doc_build:*"
+      # - "//doc_build:*"  Temporary disable
   lts_windows:
     name: lts_windows
     <<: *windows

diff --git a/examples/naming_package_files/MODULE.bazel b/examples/naming_package_files/MODULE.bazel
@@ -3,9 +3,10 @@ module(
     version = "0.0.1",
 )
 
-local_path_override(
-    module_name = "rules_pkg",
-    path = "../..",
-)
+# Temporarilly using WORKSPACE.bzlmod until CI switches to bazel past 7.0.0
+#local_path_override(
+#    module_name = "rules_pkg",
+#    path = "../..",
+#)
 
 bazel_dep(name = "rules_cc", version = "0.0.2")
diff --git a/examples/naming_package_files/WORKSPACE.bzlmod b/examples/naming_package_files/WORKSPACE.bzlmod
@@ -0,0 +1,8 @@
+local_repository(
+    name = "rules_pkg",
+    path = "../..",
+)
+
+load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
+
+rules_pkg_dependencies()
diff --git a/pkg/make_rpm.py b/pkg/make_rpm.py
@@ -357,6 +357,7 @@ def CallRpmBuild(self, dirname, rpmbuild_args):
     args += [
         '--define', '_topdir %s' % dirname,
         '--define', '_tmppath %s/TMP' % dirname,
+        '--define', '_builddir %s/BUILD' % dirname,
         '--bb',
         '--buildroot=%s' % buildroot,
     ]  # yapf: disable