Bump rules_pkg to 0.10.1, fix issues after bump

Signed-off-by: Evan Flynn <[email protected]>
ApexAI · Jul 15, 2024 · d0d9bd6 · d0d9bd6
1 parent f5efaff
commit d0d9bd6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/pkg/detail/ros_archive.bzl b/pkg/detail/ros_archive.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_pkg//:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
+load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
 load(
     ":utils.bzl",
     _add_filegroup = "add_filegroup",

diff --git a/pkg/detail/ros_pkg.bzl b/pkg/detail/ros_pkg.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_pkg//:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
+load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
 load("@rules_python//python:packaging.bzl", "PyWheelInfo")
 load(
     ":utils.bzl",

diff --git a/pkg/detail/utils.bzl b/pkg/detail/utils.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_pkg//:providers.bzl", _PackageFilegroupInfo = "PackageFilegroupInfo")
+load("@rules_pkg//pkg:providers.bzl", _PackageFilegroupInfo = "PackageFilegroupInfo")
 load("@rules_ros//pkg:providers.bzl", _RosPkgInfo = "RosPkgInfo")
 
 def add_files_to_filegroup_info(filegroup_info, pkg_files_info, label):

diff --git a/thirdparty/rules_pkg/repositories.bzl b/thirdparty/rules_pkg/repositories.bzl
@@ -1,16 +1,19 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-RULES_PKG_VERSION = "0.7.0"
-RULES_PKG_SHA = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2"
+RULES_PKG_VERSION = struct(
+    version = "0.10.1",
+    sha256 = "d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0",
+)
 
 def load_rules_pkg_repositories():
     maybe(
         name = "rules_pkg",
         repo_rule = http_archive,
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/{version}/rules_pkg-{version}.tar.gz".format(version = RULES_PKG_VERSION),
-            "https://github.com/bazelbuild/rules_pkg/releases/download/{version}/rules_pkg-{version}.tar.gz".format(version = RULES_PKG_VERSION),
+            "https://github.com/bazelbuild/rules_pkg/releases/download/{version}/rules_pkg-{version}.tar.gz".format(
+                version = RULES_PKG_VERSION.version,
+            ),
         ],
-        sha256 = RULES_PKG_SHA,
+        sha256 = RULES_PKG_VERSION.sha256,
     )