Skip to content

Commit c76e212

Browse files
authored
Merge pull request #255 from rabbitmq/absurd-mode
Eliminate the need for gazelle language extension
2 parents 3ee550e + 191ad98 commit c76e212

File tree

265 files changed

+4297
-55374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+4297
-55374
lines changed

.github/workflows/test.yaml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -289,42 +289,6 @@ jobs:
289289
if [[ "${{ steps.before.outputs.otp }}" == "${{ steps.after.outputs.otp }}" ]]; then
290290
echo "Fail"
291291
fi
292-
test-gazelle-extension:
293-
runs-on: ubuntu-20.04
294-
steps:
295-
- name: CHECKOUT
296-
uses: actions/checkout@v4
297-
- name: CONFIGURE ERLANG
298-
uses: erlef/setup-beam@v1
299-
with:
300-
otp-version: 26
301-
- name: CONFIGURE BAZEL
302-
working-directory: test
303-
run: |
304-
cat << EOF >> user.bazelrc
305-
build --color=yes
306-
EOF
307-
- name: TEST GAZELLE PACKAGE (UNIT_SUITE)
308-
working-directory: test
309-
run: |
310-
bazelisk test //gazelle:unit_suite
311-
- name: TEST GAZELLE PACKAGE (INTEGRATION_SUITE)
312-
working-directory: test
313-
run: |
314-
bazelisk test //gazelle:integration_suite --test_env PATH \
315-
|| bazelisk test //gazelle:integration_suite --test_env PATH
316-
- name: RESOVLE TEST LOGS PATH
317-
if: always()
318-
working-directory: test
319-
run: |
320-
echo "LOGS_PATH=$(readlink -f bazel-testlogs)" >> $GITHUB_OUTPUT
321-
id: resolve-test-logs-path
322-
- name: CAPTURE TEST LOGS
323-
if: always()
324-
uses: actions/upload-artifact@v4
325-
with:
326-
name: bazel-testlogs-gazelle
327-
path: ${{ steps.resolve-test-logs-path.outputs.LOGS_PATH }}/*
328292
summary:
329293
needs:
330294
- unit-test
@@ -336,7 +300,6 @@ jobs:
336300
- test-bzlmod-internal-erlang
337301
- test-bzlmod-coverage
338302
- test-host-erlang-change-detected
339-
- test-gazelle-extension
340303
runs-on: ubuntu-latest
341304
steps:
342305
- name: SUMMARY

BUILD.bazel

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
2-
load("@bazel_gazelle//:def.bzl", "gazelle")
32
load(":util_test.bzl", "util_test_suite")
43

54
config_setting(
@@ -33,22 +32,4 @@ string_flag(
3332
visibility = ["//visibility:public"],
3433
)
3534

36-
# Gazelle configuration options.
37-
# See https://github.com/bazelbuild/bazel-gazelle#running-gazelle-with-bazel
38-
# gazelle:prefix github.com/rabbitmq/rules_erlang
39-
# gazelle:exclude bazel-out
40-
gazelle(name = "gazelle")
41-
42-
gazelle(
43-
name = "update_go_deps",
44-
args = [
45-
"-from_file=go.mod",
46-
"-to_macro=gazelle/deps.bzl%gazelle_deps",
47-
"-prune",
48-
],
49-
command = "update-repos",
50-
)
51-
52-
# Tests
53-
5435
util_test_suite(name = "util_tests")

BUILD.thoas

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,8 @@
1-
load("@rules_erlang//:erlang_bytecode2.bzl", "erlang_bytecode", "erlc_opts")
21
load("@rules_erlang//:erlang_app.bzl", "erlang_app")
32

4-
erlc_opts(
5-
name = "erlc_opts",
6-
values = select({
7-
"@rules_erlang//:debug_build": [
8-
"+debug_info",
9-
],
10-
"//conditions:default": [
11-
"+debug_info",
12-
"+deterministic",
13-
],
14-
}),
15-
visibility = [":__subpackages__"],
16-
)
17-
18-
erlang_bytecode(
19-
name = "other_beam",
20-
srcs = [
21-
"src/thoas.erl",
22-
"src/thoas_decode.erl",
23-
"src/thoas_encode.erl",
24-
],
25-
outs = [
26-
"ebin/thoas.beam",
27-
"ebin/thoas_decode.beam",
28-
"ebin/thoas_encode.beam",
29-
],
30-
hdrs = [],
31-
app_name = "thoas",
32-
beam = [],
33-
erlc_opts = "//:erlc_opts",
34-
)
35-
36-
filegroup(
37-
name = "beam_files",
38-
srcs = [":other_beam"],
39-
)
40-
41-
filegroup(
42-
name = "srcs",
43-
srcs = [
44-
"src/thoas.app.src",
45-
"src/thoas.erl",
46-
"src/thoas_decode.erl",
47-
"src/thoas_encode.erl",
48-
],
49-
)
50-
51-
filegroup(
52-
name = "private_hdrs",
53-
srcs = [],
54-
)
55-
56-
filegroup(
57-
name = "public_hdrs",
58-
srcs = [],
59-
)
60-
61-
filegroup(
62-
name = "priv",
63-
srcs = [],
64-
)
65-
66-
filegroup(
67-
name = "licenses",
68-
srcs = ["LICENSE"],
69-
)
70-
71-
filegroup(
72-
name = "public_and_private_hdrs",
73-
srcs = [
74-
":private_hdrs",
75-
":public_hdrs",
76-
],
77-
)
78-
79-
filegroup(
80-
name = "all_srcs",
81-
srcs = [
82-
":public_and_private_hdrs",
83-
":srcs",
84-
],
85-
)
86-
873
erlang_app(
884
name = "erlang_app",
89-
srcs = [":all_srcs"],
905
app_name = "thoas",
91-
beam_files = [":beam_files"],
926
)
937

948
alias(

MODULE.bazel

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,30 @@
11
module(
22
name = "rules_erlang",
3-
version = "3.15.2",
4-
compatibility_level = 3,
3+
version = "4.0.0",
4+
compatibility_level = 4,
55
)
66

7-
bazel_dep(
8-
name = "rules_go",
9-
version = "0.41.0",
10-
repo_name = "io_bazel_rules_go",
11-
)
127
bazel_dep(
138
name = "bazel_skylib",
149
version = "1.4.2",
1510
)
16-
bazel_dep(
17-
name = "gazelle",
18-
version = "0.33.0",
19-
repo_name = "bazel_gazelle",
20-
)
21-
22-
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
23-
go_deps.from_file(go_mod = "@rules_erlang//:go.mod")
24-
use_repo(
25-
go_deps,
26-
"com_github_bazelbuild_buildtools",
27-
"com_github_bmatcuk_doublestar_v4",
28-
"in_gopkg_yaml_v2",
29-
)
3011

3112
erlang_package = use_extension(
3213
"//bzlmod:extensions.bzl",
3314
"erlang_package",
3415
)
3516
erlang_package.hex_package(
3617
name = "thoas_rules_erlang",
37-
pkg = "thoas",
3818
build_file = "@rules_erlang//:BUILD.thoas",
19+
pkg = "thoas",
3920
sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
4021
version = "1.0.0",
4122
)
4223
use_repo(
4324
erlang_package,
4425
"getopt_src",
45-
"xref_runner_src",
4626
"thoas_rules_erlang",
27+
"xref_runner_src",
4728
)
4829

4930
erlang_config_extension = use_extension(
@@ -55,7 +36,17 @@ use_repo(
5536
"erlang_config",
5637
)
5738

39+
gmake_config_extension = use_extension(
40+
"@rules_erlang//bzlmod:extensions.bzl",
41+
"gmake_config",
42+
)
43+
use_repo(
44+
gmake_config_extension,
45+
"gmake_config",
46+
)
47+
5848
register_toolchains(
5949
"@erlang_config//external:toolchain_major",
6050
"@erlang_config//external:toolchain_major_minor",
51+
"@gmake_config//:default_toolchain",
6152
)

0 commit comments

Comments
 (0)