Skip to content

Commit 838cd6c

Browse files
committed
Apply transition where .beam files are used
1 parent 1ffb5c5 commit 838cd6c

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

MODULE.bazel

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
module(
22
name = "rules_erlang",
3-
compatibility_level = 3,
43
version = "3.10.7",
4+
compatibility_level = 3,
55
)
66

77
bazel_dep(
88
name = "rules_go",
9-
repo_name = "io_bazel_rules_go",
109
version = "0.39.0",
10+
repo_name = "io_bazel_rules_go",
1111
)
1212
bazel_dep(
1313
name = "bazel_skylib",
1414
version = "1.4.1",
1515
)
1616
bazel_dep(
1717
name = "gazelle",
18-
repo_name = "bazel_gazelle",
1918
version = "0.29.0",
19+
repo_name = "bazel_gazelle",
2020
)
2121

2222
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
23-
2423
go_deps.from_file(go_mod = "@rules_erlang//:go.mod")
25-
2624
use_repo(
2725
go_deps,
2826
"com_github_bazelbuild_buildtools",
@@ -35,7 +33,6 @@ erlang_package = use_extension(
3533
"//bzlmod:extensions.bzl",
3634
"erlang_package",
3735
)
38-
3936
use_repo(
4037
erlang_package,
4138
"getopt_src",
@@ -46,7 +43,6 @@ erlang_config_extension = use_extension(
4643
"@rules_erlang//bzlmod:extensions.bzl",
4744
"erlang_config",
4845
)
49-
5046
use_repo(
5147
erlang_config_extension,
5248
"erlang_config",

erlang_app.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def _erlang_app(
152152
copy_file(
153153
name = "appup",
154154
src = "src/{}.appup".format(app_name),
155-
out = "ebin/{}.appup".format(app_name)
155+
out = "ebin/{}.appup".format(app_name),
156156
)
157157
appup = ":appup"
158158
else:

private/ct.bzl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ load(
2323
"erlang_dirs",
2424
"maybe_install_erlang",
2525
)
26+
load("//transitions:beam_transition.bzl", "beam_transition")
2627

2728
def sanitize_sname(s):
2829
return s.replace("@", "-").replace(".", "_")
@@ -289,6 +290,7 @@ ct_test = rule(
289290
"compiled_suites": attr.label_list(
290291
allow_files = [".beam"],
291292
mandatory = True,
293+
cfg = beam_transition,
292294
),
293295
"ct_hooks": attr.string_list(),
294296
"ct_run_extra_args": attr.string_list(),
@@ -303,6 +305,9 @@ ct_test = rule(
303305
default = "group",
304306
values = ["group", "case"],
305307
),
308+
"_allowlist_function_transition": attr.label(
309+
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
310+
),
306311
},
307312
toolchains = ["//tools:toolchain_type"],
308313
test = True,

private/dialyze.bzl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ load("//:erlang_app_info.bzl", "ErlangAppInfo")
77
load("//:util.bzl", "path_join", "windows_path")
88
load(":util.bzl", "erl_libs_contents")
99
load(":ct.bzl", "code_paths", "unique_short_dirnames")
10+
load("//transitions:beam_transition.bzl", "beam_transition")
1011

1112
def _impl(ctx):
1213
if ctx.attr.target == None and len(ctx.attr.beam) == 0:
@@ -114,6 +115,7 @@ dialyze_test = rule(
114115
),
115116
"beam": attr.label_list(
116117
allow_files = [".beam"],
118+
cfg = beam_transition,
117119
),
118120
"target": attr.label(
119121
providers = [ErlangAppInfo],
@@ -129,6 +131,9 @@ dialyze_test = rule(
129131
],
130132
),
131133
"warnings_as_errors": attr.bool(default = True),
134+
"_allowlist_function_transition": attr.label(
135+
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
136+
),
132137
},
133138
toolchains = ["//tools:toolchain_type"],
134139
test = True,

test/MODULE.bazel

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,25 @@ bazel_dep(
99
)
1010
bazel_dep(
1111
name = "rules_go",
12-
repo_name = "io_bazel_rules_go",
1312
version = "0.39.0",
13+
repo_name = "io_bazel_rules_go",
1414
)
1515
bazel_dep(
1616
name = "gazelle",
17-
repo_name = "bazel_gazelle",
1817
version = "0.29.0",
18+
repo_name = "bazel_gazelle",
1919
)
2020
bazel_dep(
2121
name = "rules_erlang",
2222
version = "3.0.0",
2323
)
24-
2524
local_path_override(
2625
module_name = "rules_erlang",
2726
path = "..",
2827
)
2928

3029
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
31-
3230
go_deps.from_file(go_mod = "@rules_erlang_test//:go.mod")
33-
3431
use_repo(
3532
go_deps,
3633
"com_github_bazelbuild_buildtools",
@@ -45,9 +42,7 @@ erlang_config_extension = use_extension(
4542
"erlang_config",
4643
dev_dependency = True,
4744
)
48-
4945
erlang_config_extension.internal_erlang_from_github_release()
50-
5146
use_repo(
5247
erlang_config_extension,
5348
"erlang_config",
@@ -63,14 +58,12 @@ erlang_package = use_extension(
6358
"erlang_package",
6459
dev_dependency = True,
6560
)
66-
6761
erlang_package.hex_package(
6862
name = "thoas",
6963
build_file = "@//:BUILD.thoas",
7064
sha256 = "442296847aca11db8d25180693d7ca3073d6d7179f66952f07b16415306513b6",
7165
version = "0.4.0",
7266
)
73-
7467
use_repo(
7568
erlang_package,
7669
"thoas",

0 commit comments

Comments
 (0)