Skip to content

Commit f5be782

Browse files
authored
Merge pull request #10801 from rabbitmq/rin/use-rules_erlang-3.15.0
Use rules_erlang 3.15.0
2 parents 5feed38 + 7a54b46 commit f5be782

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

MODULE.bazel

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bazel_dep(
3636

3737
bazel_dep(
3838
name = "rules_erlang",
39-
version = "3.14.0",
39+
version = "3.15.0",
4040
)
4141

4242
bazel_dep(
@@ -61,49 +61,57 @@ erlang_config.internal_erlang_from_github_release(
6161
name = "24",
6262
sha256 = "8444ff9abe23aea268adbb95463561fc222c965052d35d7c950b17be01c3ad82",
6363
version = "24.3.4.6",
64+
extra_make_opts = ["-j 4"],
6465
)
6566

6667
erlang_config.internal_erlang_from_github_release(
6768
name = "25_0",
6869
sha256 = "8fc707f92a124b2aeb0f65dcf9ac8e27b2a305e7bcc4cc1b2fdf770eec0165bf",
6970
version = "25.0.4",
71+
extra_make_opts = ["-j 4"],
7072
)
7173

7274
erlang_config.internal_erlang_from_github_release(
7375
name = "25_1",
7476
sha256 = "1cd2fbe225a412009cda9b1fd9f3fff0293e75e3020daa48abf68721471e91eb",
7577
version = "25.1.2.1",
78+
extra_make_opts = ["-j 4"],
7679
)
7780

7881
erlang_config.internal_erlang_from_github_release(
7982
name = "25_2",
8083
sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
8184
version = "25.2.3",
85+
extra_make_opts = ["-j 4"],
8286
)
8387

8488
erlang_config.internal_erlang_from_github_release(
8589
name = "25_3",
8690
sha256 = "0a7338415c8eb6ae25664bfd1a10631c293838ef072665223a524831b823a8b7",
8791
version = "25.3.2.10",
92+
extra_make_opts = ["-j 4"],
8893
)
8994

9095
erlang_config.internal_erlang_from_github_release(
9196
name = "26_1",
9297
sha256 = "f1074cf3a54f1f87e66027d5abebab2fa76a0243453fa58bc5f30d0ce0313921",
9398
version = "26.1.2",
99+
extra_make_opts = ["-j 4"],
94100
)
95101

96102
erlang_config.internal_erlang_from_github_release(
97103
name = "26_2",
98104
sha256 = "d537ff4ac5d8c1cb507aedaf7198fc1f155ea8aa65a8d83edb35c2802763cc28",
99105
version = "26.2.2",
106+
extra_make_opts = ["-j 4"],
100107
)
101108

102109
erlang_config.internal_erlang_from_http_archive(
103110
name = "git_master",
104111
strip_prefix = "otp-master",
105112
url = "https://github.com/erlang/otp/archive/refs/heads/master.tar.gz",
106113
version = "27",
114+
extra_make_opts = ["-j 4"],
107115
)
108116

109117
use_repo(

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rules_pkg_dependencies()
1919
git_repository(
2020
name = "rules_erlang",
2121
remote = "https://github.com/rabbitmq/rules_erlang.git",
22-
tag = "3.13.1",
22+
tag = "3.15.0",
2323
)
2424

2525
load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")

bazel/elixir/elixir_toolchain.bzl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,13 @@ def maybe_install_erlang(ctx, short_path = False):
5656
return ""
5757
else:
5858
return """\
59-
tar --extract \\
60-
--directory / \\
61-
--file {release_tar}""".format(
59+
mkdir -p $(dirname "{install_path}")
60+
if mkdir "{install_path}"; then
61+
tar --extract \\
62+
--directory "{install_path}" \\
63+
--file {release_tar}
64+
fi\
65+
""".format(
6266
release_tar = release_dir_tar.short_path if short_path else release_dir_tar.path,
63-
erlang_home = info.erlang_home,
67+
install_path = info.install_path,
6468
)

0 commit comments

Comments
 (0)