Merge pull request #16229 from github/criemen/rules-pkg

Upgrade rules_pkg to 0.10.1.
2025-12-16 16:53:25 +01:00 · 2024-04-16 18:03:00 +02:00
parent c647f30576 6ba27dc863
commit 4cb0695646
18 changed files with 20 additions and 20 deletions
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,7 +14,7 @@ local_path_override(
 # see https://registry.bazel.build/ for a list of available packages

 bazel_dep(name = "platforms", version = "0.0.8")
-bazel_dep(name = "rules_pkg", version = "0.9.1")
+bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "rules_nodejs", version = "6.0.3")
 bazel_dep(name = "rules_python", version = "0.31.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
--- a/cpp/BUILD.bazel
+++ b/cpp/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")

 package(default_visibility = ["//visibility:public"])

--- a/cpp/downgrades/BUILD.bazel
+++ b/cpp/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")

 pkg_files(
    name = "downgrades",
--- a/cpp/ql/lib/BUILD.bazel
+++ b/cpp/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//cpp:__pkg__"])

--- a/csharp/ql/lib/BUILD.bazel
+++ b/csharp/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//csharp:__pkg__"])

--- a/java/ql/lib/config/BUILD.bazel
+++ b/java/ql/lib/config/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//java:__pkg__"])

--- a/javascript/ql/lib/BUILD.bazel
+++ b/javascript/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//javascript:__pkg__"])

--- a/misc/bazel/pkg_runfiles.bzl
+++ b/misc/bazel/pkg_runfiles.bzl
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files")

 def _runfiles_group_impl(ctx):
    files = []
--- a/misc/bazel/workspace_deps.bzl
+++ b/misc/bazel/workspace_deps.bzl
@@ -1,6 +1,6 @@
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("@rules_python//python:pip.bzl", "pip_install")
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
+load("@rules_python//python:pip.bzl", "pip_install")

 def codeql_workspace_deps(repository_name = "codeql"):
    pip_install(
--- a/python/downgrades/BUILD.bazel
+++ b/python/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")

 pkg_files(
    name = "downgrades",
--- a/python/ql/lib/BUILD.bazel
+++ b/python/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//python:__pkg__"])

--- a/ruby/downgrades/BUILD.bazel
+++ b/ruby/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")

 pkg_files(
    name = "downgrades",
--- a/ruby/ql/lib/BUILD.bazel
+++ b/ruby/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 package(default_visibility = ["//ruby:__pkg__"])

--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-load("@rules_pkg//:install.bzl", "pkg_install")
+load("@rules_pkg//pkg:install.bzl", "pkg_install")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 load("//:defs.bzl", "codeql_platform")
 load("//misc/bazel:pkg_runfiles.bzl", "pkg_runfiles")
 load("//misc/bazel/cmake:cmake.bzl", "generate_cmake")
--- a/swift/downgrades/BUILD.bazel
+++ b/swift/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")

 pkg_files(
    name = "downgrades",
--- a/swift/third_party/BUILD.swift-toolchain-linux.bazel
+++ b/swift/third_party/BUILD.swift-toolchain-linux.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")

 _strip_prefix = "usr/lib/swift"

--- a/swift/third_party/BUILD.swift-toolchain-macos.bazel
+++ b/swift/third_party/BUILD.swift-toolchain-macos.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")

 _strip_prefix = "usr/lib/swift"

--- a/swift/tools/BUILD.bazel
+++ b/swift/tools/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")

 sh_binary(
    name = "qltest",