From 62665f881df71583fcfb22657f5af0ec8f9790c9 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Fri, 28 Jan 2022 14:05:00 -0800 Subject: [PATCH] Remove unnecessary use of _impl pkg rules. Updates bazelbuild/rules_pkg#263 PiperOrigin-RevId: 424953384 --- WORKSPACE | 7 +++++-- debian/BUILD | 1 - tools/bazeldefs/pkg.bzl | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8efe045f6..16d19c79a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -585,8 +585,11 @@ rbe_autoconfig(name = "rbe_default") http_archive( name = "rules_pkg", - sha256 = "353b20e8b093d42dd16889c7f918750fb8701c485ac6cceb69a5236500507c27", - url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.5.0/rules_pkg-0.5.0.tar.gz", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.6.0/rules_pkg-0.6.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.6.0/rules_pkg-0.6.0.tar.gz", + ], + sha256 = "62eeb544ff1ef41d786e329e1536c1d541bb9bcad27ae984d57f18f314018e66", ) load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") diff --git a/debian/BUILD b/debian/BUILD index a62164cb0..7e9a0727d 100644 --- a/debian/BUILD +++ b/debian/BUILD @@ -23,7 +23,6 @@ pkg_tar( pkg_deb( name = "debian", - out = "runsc-latest.deb", architecture = select_arch( amd64 = "amd64", arm64 = "arm64", diff --git a/tools/bazeldefs/pkg.bzl b/tools/bazeldefs/pkg.bzl index ccc9bdeef..1cbd8860f 100644 --- a/tools/bazeldefs/pkg.bzl +++ b/tools/bazeldefs/pkg.bzl @@ -1,7 +1,6 @@ """Packaging rules.""" -# N.B. We refer to pkg_deb_impl to avoid the macro, which cannot use select. -load("@rules_pkg//:pkg.bzl", _pkg_deb = "pkg_deb_impl", _pkg_tar = "pkg_tar") +load("@rules_pkg//pkg:pkg.bzl", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar") pkg_deb = _pkg_deb pkg_tar = _pkg_tar