Merge pull request #3963 from rabbitmq/use-rules_erlang

Use rules_erlang 2.0.0

Author: HoloRin

.bazelrc

@@ -18,7 +18,7 @@ build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
 build:rbe --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
 build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 
-build:rbe --@bazel-erlang//:erlang_home=/usr/lib/erlang
+build:rbe --@rules_erlang//:erlang_home=/usr/lib/erlang
 build:rbe --//:elixir_home=/usr/local
 
 build:rbe --spawn_strategy=remote
@@ -37,7 +37,7 @@ build:rbe-23 --host_platform=@rbe_23//config:platform
 build:rbe-23 --platforms=@rbe_23//config:platform
 build:rbe-23 --extra_execution_platforms=@rbe_23//config:platform
 
-build:rbe-23 --@bazel-erlang//:erlang_version=23
+build:rbe-23 --@rules_erlang//:erlang_version=23
 
 build:rbe-24 --config=rbe
 build:rbe-24 --host_javabase=@rbe_24//java:jdk
@@ -49,7 +49,7 @@ build:rbe-24 --host_platform=@rbe_24//config:platform
 build:rbe-24 --platforms=@rbe_24//config:platform
 build:rbe-24 --extra_execution_platforms=@rbe_24//config:platform
 
-build:rbe-24 --@bazel-erlang//:erlang_version=24
+build:rbe-24 --@rules_erlang//:erlang_version=24
 
 # Try importing a user specific .bazelrc
 # You can create your own by copying and editing the template-user.bazelrc template:

.github/workflows/test-erlang-git.yaml

@@ -51,8 +51,8 @@ jobs:
           build:rbe-git --host_platform=//:erlang_git_platform
           build:rbe-git --platforms=//:erlang_git_platform
           build:rbe-git --extra_execution_platforms=//:erlang_git_platform
-          build:rbe-git --@bazel-erlang//:erlang_home=/usr/local/lib/erlang
-          build:rbe-git --@bazel-erlang//:erlang_version=25
+          build:rbe-git --@rules_erlang//:erlang_home=/usr/local/lib/erlang
+          build:rbe-git --@rules_erlang//:erlang_version=25
         EOF
     #! - name: Setup tmate session
     #!   uses: mxschmitt/action-tmate@v3

.github/workflows/test-mixed-versions.yaml

@@ -99,8 +99,8 @@ jobs:
           build:buildbuddy --color=yes
           build:buildbuddy --disk_cache=
 
-          build --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@bazel-erlang//:erlang_home=${ERLANG_HOME}
+          build --@rules_erlang//:erlang_version=${{ matrix.erlang_version }}
+          build --@rules_erlang//:erlang_home=${ERLANG_HOME}
           build --//:elixir_home=${ELIXIR_HOME}
         EOF
     #! - name: Setup tmate session

.github/workflows/test.yaml

@@ -93,8 +93,8 @@ jobs:
           build:buildbuddy --color=yes
           build:buildbuddy --disk_cache=
 
-          build --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@bazel-erlang//:erlang_home=${ERLANG_HOME}
+          build --@rules_erlang//:erlang_version=${{ matrix.erlang_version }}
+          build --@rules_erlang//:erlang_home=${ERLANG_HOME}
           build --//:elixir_home=${ELIXIR_HOME}
         EOF
     #! - name: Setup tmate session

.github/workflows/update-bazel-erlang.yaml renamed to .github/workflows/update-rules_erlang.yaml

@@ -1,33 +1,33 @@
-name: Update bazel-erlang
+name: Update rules_erlang
 on:
   schedule:
   - cron: '0 3 * * *'
   workflow_dispatch:
 jobs:
-  update-bazel-erlang:
-    name: Update bazel-erlang
+  update-rules_erlang:
+    name: Update rules_erlang
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/[email protected]
       with:
         path: rabbitmq-server
-    - name: CHECKOUT bazel-erlang
+    - name: CHECKOUT rules_erlang
       uses: actions/[email protected]
       with:
-        repository: rabbitmq/bazel-erlang
-        path: bazel-erlang
+        repository: rabbitmq/rules_erlang
+        path: rules_erlang
     - name: DETERMINE LATEST COMMIT
       id: find-commit
-      working-directory: bazel-erlang
+      working-directory: rules_erlang
       run: |
         echo "::set-output name=SHA::$(git rev-parse HEAD)"
-    - name: UPDATE bazel-erlang COMMIT
+    - name: UPDATE rules_erlang COMMIT
       working-directory: rabbitmq-server
       run: |
         sudo npm install --global --silent @bazel/buildozer
-        echo "$(cat WORKSPACE.bazel | npx buildozer 'set commit "${{ steps.find-commit.outputs.SHA }}"' -:bazel-erlang)" > WORKSPACE.bazel
+        echo "$(cat WORKSPACE.bazel | npx buildozer 'set commit "${{ steps.find-commit.outputs.SHA }}"' -:rules_erlang)" > WORKSPACE.bazel
         git diff
     - name: CREATE PULL REQUEST
       uses: peter-evans/create-pull-request@v3
@@ -36,10 +36,10 @@ jobs:
         committer: GitHub <[email protected]>
         author: GitHub <[email protected]>
         path: rabbitmq-server
-        title: Adopt latest bazel-erlang
+        title: Adopt latest rules_erlang
         commit-message: |
-          Adopt latest bazel-erlang
+          Adopt latest rules_erlang
 
-          - bazel-erlang@${{ steps.find-commit.outputs.SHA }}
-        branch: bump-bazel-erlang
+          - rules_erlang@${{ steps.find-commit.outputs.SHA }}
+        branch: bump-rules_erlang
         delete-branch: true

BUILD.bazel

@@ -1,6 +1,6 @@
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
-load("@bazel-erlang//:dialyze.bzl", "plt")
-load("@bazel-erlang//:shell.bzl", "shell")
+load("@rules_erlang//:dialyze.bzl", "plt")
+load("@rules_erlang//:shell.bzl", "shell")
 load("elixir_home.bzl", "elixir_home")
 load(":rabbitmq_home.bzl", "rabbitmq_home")
 load(":rabbitmq_run.bzl", "rabbitmq_run", "rabbitmq_run_command")
@@ -10,6 +10,7 @@ load(":dist.bzl", "collect_licenses", "versioned_rabbitmq_home")
 
 exports_files([
     "scripts/bazel/rabbitmq-run.sh",
+    "scripts/bazel/rabbitmq-run.bat",
 ])
 
 config_setting(
@@ -52,30 +53,12 @@ rabbitmq_home(
     plugins = all_plugins(rabbitmq_workspace = ""),
 )
 
-rabbitmq_home(
-    name = "broker-for-cli-tests-home",
-    testonly = True,
-    plugins = [
-        "//deps/rabbit:bazel_erlang_lib",
-        "//deps/rabbitmq_federation:bazel_erlang_lib",
-        "//deps/rabbitmq_stomp:bazel_erlang_lib",
-        "//deps/amqp_client:bazel_erlang_lib",
-    ],
-)
-
 rabbitmq_run(
     name = "rabbitmq-run",
     home = ":broker-home",
     visibility = ["//visibility:public"],
 )
 
-rabbitmq_run(
-    name = "rabbitmq-for-cli-tests-run",
-    testonly = True,
-    home = ":broker-for-cli-tests-home",
-    visibility = ["//visibility:public"],
-)
-
 # Allow us to `bazel run broker`
 # for the equivalent of `make run-broker`
 rabbitmq_run_command(

BUILD.inet_tcp_proxy

@@ -1,6 +1,6 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib")
+load("@rules_erlang//:erlang_app.bzl", "erlang_app")
 
-erlang_lib(
+erlang_app(
     app_name = "inet_tcp_proxy_dist",
     app_version = "0.1.0",
     app_description = "Erlang distribution proxy to simulate network failures",

BUILD.ranch

@@ -1,5 +1,7 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "app_file", "bazel_erlang_lib", "erlc",
-"DEFAULT_ERLC_OPTS")
+load("@rules_erlang//:app_file.bzl", "app_file")
+load("@rules_erlang//:erlang_app_info.bzl", "erlang_app_info")
+load("@rules_erlang//:erlang_app.bzl", "DEFAULT_ERLC_OPTS")
+load("@rules_erlang//:erlc.bzl", "erlc")
 
 FIRST_SRCS = [
     "src/ranch_transport.erl",
@@ -36,8 +38,8 @@ app_file(
     modules = [":first_beam_files", ":beam_files"],
 )
 
-bazel_erlang_lib(
-    name = "bazel_erlang_lib",
+erlang_app_info(
+    name = "erlang_app",
     app_name = "ranch",
     app = ":app_file",
     hdrs = glob(["include/**/*.hrl"]),

BUILD.trust_store_http

@@ -1,6 +1,6 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib")
+load("@rules_erlang//:erlang_app.bzl", "erlang_app")
 
-erlang_lib(
+erlang_app(
     app_name = "trust_store_http",
     app_description = "Trust store HTTP server",
     app_module = "trust_store_http_app",
@@ -9,7 +9,7 @@ erlang_lib(
         "ssl",
     ],
     deps = [
-        "@cowboy//:bazel_erlang_lib",
-        "@jsx//:bazel_erlang_lib",
+        "@cowboy//:erlang_app",
+        "@jsx//:erlang_app",
     ],
 )

WORKSPACE.bazel

@@ -58,14 +58,14 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 rules_pkg_dependencies()
 
 git_repository(
-    name = "bazel-erlang",
-    commit = "d62a13548b3d1e5bd2830f42e3f3933ae17db3cb",
-    remote = "https://github.com/rabbitmq/bazel-erlang.git",
+    name = "rules_erlang",
+    commit = "400b0ec47a92966ebfe17cbf30ef92e78d0f519a",
+    remote = "https://github.com/rabbitmq/rules_erlang.git",
 )
 
-load("@bazel-erlang//:bazel_erlang.bzl", "bazel_erlang_deps")
+load("@rules_erlang//:rules_erlang.bzl", "rules_erlang_dependencies")
 
-bazel_erlang_deps()
+rules_erlang_dependencies()
 
 load("//:workspace_helpers.bzl", "rabbitmq_external_deps")
 
@@ -84,7 +84,7 @@ pkg_zip(
     name = "inet_tcp_proxy_ez",
     package_dir = "inet_tcp_proxy/ebin",
     srcs = [
-        "@inet_tcp_proxy//:bazel_erlang_lib",
+        "@inet_tcp_proxy//:erlang_app",
     ],
     package_file_name = "inet_tcp_proxy.ez",
     visibility = ["//visibility:public"],