Skip to content

Commit

Permalink
Update multiple dependency versions.
Browse files Browse the repository at this point in the history
This PR takes care of a bunch of subtasks of bazelbuild#672
And also closes bazelbuild#587, bazelbuild#632, bazelbuild#645
  • Loading branch information
mishas committed Jun 16, 2022
1 parent d63175c commit 5ce2e82
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 21 deletions.
10 changes: 0 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.
workspace(name = "io_bazel_rules_k8s")

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//k8s:k8s.bzl", "k8s_defaults", "k8s_repositories")

Expand Down Expand Up @@ -41,15 +40,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

# Mention subpar directly to ensure we get version 2.0.0,
# which included fixes for incompatible change flags added in Bazel 0.25. This
# can be removed once other dependencies are updated.
git_repository(
name = "subpar",
commit = "9fae6b63cfeace2e0fb93c9c1ebdc28d3991b16f",
remote = "https://github.com/google/subpar.git",
)

# Only needed if using the packaging rules.
load("@rules_python//python:pip.bzl", "pip_install")

Expand Down
20 changes: 11 additions & 9 deletions k8s/k8s.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ def k8s_repositories():
http_archive,
name = "com_github_yaml_pyyaml",
build_file_content = _com_github_yaml_pyyaml_build_file,
sha256 = "e9df8412ddabc9c21b4437ee138875b95ebb32c25f07f962439e16005152e00e",
strip_prefix = "pyyaml-5.1.2",
urls = ["https://github.com/yaml/pyyaml/archive/5.1.2.zip"],
sha256 = "ab5a9bc8aa7ffb3bd686cc5480c45d919bc2fa011a0623ca359997a1e7a75fbe",
strip_prefix = "pyyaml-6.0",
urls = ["https://github.com/yaml/pyyaml/archive/6.0.zip"],
)

# Register the default kubectl toolchain targets for supported platforms
Expand All @@ -80,10 +80,10 @@ def k8s_repositories():
maybe(
http_archive,
name = "bazel_gazelle",
sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4",
sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
],
)

Expand All @@ -98,9 +98,11 @@ def k8s_repositories():
maybe(
http_archive,
name = "bazel_skylib",
sha256 = "7ac0fa88c0c4ad6f5b9ffb5e09ef81e235492c873659e6bb99efb89d11246bcb",
strip_prefix = "bazel-skylib-1.0.3",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/1.0.3.tar.gz"],
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
urls = [
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
],
)

# WORKSPACE target to configure the kubectl tool
Expand Down
4 changes: 2 additions & 2 deletions k8s/k8s_go_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ def deps():
go_repository,
name = "com_github_google_go_cmp",
importpath = "github.com/google/go-cmp",
sum = "h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=",
version = "v0.3.1",
sum = "h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=",
version = "v0.5.6",
)

0 comments on commit 5ce2e82

Please sign in to comment.