Skip to content

Commit

Permalink
fix: fix issue with bzlmod toolchain registration with minimum bump t…
Browse files Browse the repository at this point in the history
…o rules_nodejs 6.1.2 (#1780)
  • Loading branch information
gregmagolan authored Jun 6, 2024
1 parent d4ac702 commit bc87775
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release_prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ bazel_dep(name = "aspect_rules_js", version = "${TAG:1}")
####### Node.js version #########
# By default you get the node version from DEFAULT_NODE_VERSION in @rules_nodejs//nodejs:repositories.bzl
# Optionally you can pin a different node version:
bazel_dep(name = "rules_nodejs", version = "6.1.0")
bazel_dep(name = "rules_nodejs", version = "6.1.2")
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
node.toolchain(node_version = "16.14.2")
#################################
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
bazel_dep(name = "bazel_features", version = "1.9.0")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "platforms", version = "0.0.5")
bazel_dep(name = "rules_nodejs", version = "6.1.0")
bazel_dep(name = "rules_nodejs", version = "6.1.2")

node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
use_repo(node, "nodejs_darwin_amd64")
Expand Down
4 changes: 2 additions & 2 deletions e2e/js_image_oci/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ local_path_override(
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
bazel_dep(name = "container_structure_test", version = "1.16.0", dev_dependency = True)
bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "5.8.2", dev_dependency = True)
bazel_dep(name = "rules_oci", version = "1.7.6", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)
bazel_dep(name = "rules_oci", version = "2.0.0-alpha2", dev_dependency = True)

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
npm.npm_translate_lock(
Expand Down
13 changes: 5 additions & 8 deletions e2e/js_image_oci/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,18 @@ npm_repositories()

http_archive(
name = "rules_oci",
sha256 = "647f4c6fd092dc7a86a7f79892d4b1b7f1de288bdb4829ca38f74fd430fcd2fe",
strip_prefix = "rules_oci-1.7.6",
url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.7.6/rules_oci-v1.7.6.tar.gz",
sha256 = "e96d70faa4bace3e09fdb1d7d1441b838920f491588889ff9a7e2615afca5799",
strip_prefix = "rules_oci-2.0.0-alpha2",
url = "https://github.com/bazel-contrib/rules_oci/releases/download/v2.0.0-alpha2/rules_oci-v2.0.0-alpha2.tar.gz",
)

load("@rules_oci//oci:dependencies.bzl", "rules_oci_dependencies")

rules_oci_dependencies()

load("@rules_oci//oci:repositories.bzl", "LATEST_CRANE_VERSION", "oci_register_toolchains")
load("@rules_oci//oci:repositories.bzl", "oci_register_toolchains")

oci_register_toolchains(
name = "oci",
crane_version = LATEST_CRANE_VERSION,
)
oci_register_toolchains(name = "oci")

## Pull base images
load("@rules_oci//oci:pull.bzl", "oci_pull")
Expand Down
2 changes: 1 addition & 1 deletion e2e/pnpm_lockfiles/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PNPM_LOCK_TEST_CASES = [
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")

bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

bazel_dep(name = "platforms", version = "0.0.5")

Expand Down
2 changes: 1 addition & 1 deletion e2e/pnpm_repo_install/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

node = use_extension(
"@rules_nodejs//nodejs:extensions.bzl",
Expand Down
2 changes: 1 addition & 1 deletion e2e/pnpm_workspace/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local_path_override(

bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

node = use_extension(
"@rules_nodejs//nodejs:extensions.bzl",
Expand Down
2 changes: 1 addition & 1 deletion e2e/pnpm_workspace_rerooted/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

node = use_extension(
"@rules_nodejs//nodejs:extensions.bzl",
Expand Down
2 changes: 1 addition & 1 deletion e2e/vendored_node/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ local_path_override(
)

bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

register_toolchains("//toolchains:all")
2 changes: 1 addition & 1 deletion e2e/worker/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local_path_override(

bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
bazel_dep(name = "rules_nodejs", version = "6.1.2", dev_dependency = True)

node = use_extension(
"@rules_nodejs//nodejs:extensions.bzl",
Expand Down
6 changes: 3 additions & 3 deletions js/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def rules_js_dependencies():

http_archive(
name = "rules_nodejs",
sha256 = "dddd60acc3f2f30359bef502c9d788f67e33814b0ddd99aa27c5a15eb7a41b8c",
strip_prefix = "rules_nodejs-6.1.0",
url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.1.0/rules_nodejs-v6.1.0.tar.gz",
sha256 = "b6016a89a12a3d339ece93f2b3988f5e812f452ad497bc963634646ff4aa100b",
strip_prefix = "rules_nodejs-6.1.2",
url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.1.2/rules_nodejs-v6.1.2.tar.gz",
)

http_archive(
Expand Down

0 comments on commit bc87775

Please sign in to comment.