Skip to content

Commit

Permalink
Merge branch 'rabbitmq:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
massive688 authored Aug 21, 2024
2 parents 620ceee + f8f0d33 commit 5f25df8
Show file tree
Hide file tree
Showing 2,381 changed files with 104,986 additions and 51,043 deletions.
65 changes: 2 additions & 63 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,12 @@ build --local_test_jobs=1

build --flag_alias=erlang_home=@rules_erlang//:erlang_home
build --flag_alias=erlang_version=@rules_erlang//:erlang_version
build --flag_alias=elixir_home=//:elixir_home
build --flag_alias=elixir_home=@rules_elixir//:elixir_home
build --flag_alias=test_build=//:enable_test_build

build --test_timeout=7200

build:buildbuddy --bes_results_url=https://app.buildbuddy.io/invocation/
build:buildbuddy --bes_backend=grpcs://remote.buildbuddy.io
build:buildbuddy --remote_cache=grpcs://remote.buildbuddy.io
build:buildbuddy --remote_timeout=1200
build:buildbuddy --grpc_keepalive_time=360s
build:buildbuddy --grpc_keepalive_timeout=360s
build:buildbuddy --remote_download_minimal
build:buildbuddy --build_metadata=REPO_URL=https://github.com/rabbitmq/rabbitmq-server.git
build:buildbuddy --experimental_remote_cache_compression
build:buildbuddy --experimental_remote_cache_async
build:buildbuddy --noslim_profile
build:buildbuddy --experimental_profile_include_target_label
build:buildbuddy --experimental_profile_include_primary_output
build:buildbuddy --experimental_remote_build_event_upload=minimal
build:buildbuddy --nolegacy_important_outputs

# buildbuddy implies remote cache, so ct_logdir is restored to its default for reproducibility
build:buildbuddy --@rules_erlang//:ct_logdir=

build:rbe --config=buildbuddy

build:rbe --remote_executor=grpcs://remote.buildbuddy.io

build:rbe --spawn_strategy=remote,local
build:rbe --test_strategy=""
build:rbe --jobs=50

build:rbe --crosstool_top=@rbe//cc:toolchain
build:rbe --extra_toolchains=@rbe//config:cc-toolchain

build:rbe --host_platform=//bazel/platforms:erlang_internal_platform

build:rbe --host_cpu=k8
build:rbe --cpu=k8

build:rbe-24 --config=rbe
build:rbe-24 --platforms=//bazel/platforms:erlang_linux_24_platform

build:rbe-25 --config=rbe
build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_3_platform

build:rbe-25_0 --config=rbe
build:rbe-25_0 --platforms=//bazel/platforms:erlang_linux_25_0_platform

build:rbe-25_1 --config=rbe
build:rbe-25_1 --platforms=//bazel/platforms:erlang_linux_25_1_platform

build:rbe-25_2 --config=rbe
build:rbe-25_2 --platforms=//bazel/platforms:erlang_linux_25_2_platform

build:rbe-25_3 --config=rbe
build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform

build:rbe-26 --config=rbe
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_platform

# no-op config so that --config=local does not error
build:local --color=auto

# having bzlmod enabled seems to interfere with docker toolchain resolution,
# so we set this flag
build --@io_bazel_rules_docker//transitions:enable=false
build --combined_report=lcov

# Try importing a user specific .bazelrc
# You can create your own by copying and editing the template-user.bazelrc template:
Expand Down
3 changes: 3 additions & 0 deletions .elp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build_info]
apps = "deps/*"
deps = ""
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
209f23fa2f58e0240116b3e8e5be9cd54d34b569
# Format MQTT code with erlfmt
1de9fcf582def91d1cee6bea457dd24e8a53a431
# Remove unsed imports
cfa3de4b2b1a07e9f4ef90d0aa6b22252238bc47
29 changes: 16 additions & 13 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
Thank you for using RabbitMQ.

**STOP NOW AND READ THIS** BEFORE OPENING A NEW ISSUE ON GITHUB
**STOP NOW AND READ THIS** before proceeding, or your issue will be moved to Discussions
and deleted.

Unless you are CERTAIN you have found a reproducible problem in RabbitMQ or
have a **specific, actionable** suggestion for our team, you must first ask
your question or discuss your suspected issue on the mailing list:
Please read https://github.com/rabbitmq/rabbitmq-server/blob/main/COMMUNITY_SUPPORT.md
and https://github.com/rabbitmq/rabbitmq-server/blob/main/CONTRIBUTING.md#github-issues
first.

https://groups.google.com/forum/#!forum/rabbitmq-users
Unless you are **certain** that you are eligible for community support from the core team, please direct your
questions to https://github.com/rabbitmq/rabbitmq-server/discussions and https://rabbitmq.com/discord/.

Team RabbitMQ does not use GitHub issues for discussions, investigations, root
cause analysis and so on.
Issues that lack key relevant information, such as

Please take the time to read the CONTRIBUTING.md document for instructions on
how to effectively ask a question or report a suspected issue:
* RabbitMQ and Erlang versions used
* The operating system used and its version (distribution)
* Client library (and any "higher level" libraries or frameworks used) used and their versions
* **Specific and detailed** steps to set up an environment where the behavior can be reproduced

https://github.com/rabbitmq/rabbitmq-server/blob/main/CONTRIBUTING.md#github-issues
will be moved to Discussions and then deleted.

Following these rules **will save time** for both you and RabbitMQ's maintainers.

Thank you.
RabbitMQ Core Team does use GitHub issues for questions and discussions. Root cause analysis
and technical operations guidance will ONLY will provided to those eligible per
https://github.com/rabbitmq/rabbitmq-server/blob/main/COMMUNITY_SUPPORT.md.
6 changes: 2 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ If it fixes a bug or resolves a feature request, be sure to link to that issue.

A pull request that doesn't explain **why** the change was made has a much lower chance of being accepted.

If English isn't your first language, don't worry about it and try to communicate the problem you are trying to solve to the best of your abilities.
As long as we can understand the intent, it's all good.

## Types of Changes

What types of changes does your code introduce to this project?
Expand Down Expand Up @@ -37,4 +34,5 @@ This is simply a reminder of what we are going to look for before merging your c

## Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc.
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.
14 changes: 2 additions & 12 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,12 @@ updates:
directory: "/"
schedule:
interval: "daily"
target-branch: "v3.11.x"
target-branch: "v4.0.x"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "v3.10.x"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "v3.9.x"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "v3.8.x"
target-branch: "v3.13.x"
# Maintain dependencies for Java test projects
- package-ecosystem: "maven"
directory: "/deps/rabbitmq_mqtt/test/java_SUITE_data"
Expand Down
124 changes: 17 additions & 107 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,139 +13,49 @@ pull_request_rules:
label:
add:
- make
- name: Automatically backport to v3.12.x based on label
- name: Automatically backport to v4.0.x based on label
conditions:
- base=main
- label=backport-v3.12.x
- label!=backport-v3.11.x
- label!=backport-v3.10.x
- label!=backport-v3.9.x
- label=backport-v4.0.x
- label!=backport-v3.13.x
- label!=backport-v3.12.x
actions:
backport:
branches:
- v3.12.x
- v4.0.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.12.x & v3.11.x based on label
- name: Automatically backport to v4.0.x & v3.13.x based on label
conditions:
- base=main
- label=backport-v3.12.x
- label=backport-v3.11.x
- label!=backport-v3.10.x
- label!=backport-v3.9.x
- label=backport-v4.0.x
- label=backport-v3.13.x
actions:
backport:
branches:
- v3.12.x
- v4.0.x
labels:
- backport-v3.11.x
- backport-v3.13.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.12.x, v3.11.x & v3.10.x based on labels
- name: Automatically backport to v3.13.x based on label
conditions:
- base=main
- label=backport-v3.12.x
- label=backport-v3.11.x
- label=backport-v3.10.x
- label!=backport-v3.9.x
- base=v4.0.x
- label=backport-v3.13.x
- label!=backport-v3.12.x
actions:
backport:
branches:
- v3.12.x
labels:
- backport-v3.11.x
- backport-v3.10.x
- v3.13.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.12.x, v3.11.x, v3.10.x & v3.9.x based on labels
- name: Automatically backport to v3.12.x based on label
conditions:
- base=main
- base=v3.13.x
- label=backport-v3.12.x
- label=backport-v3.11.x
- label=backport-v3.10.x
- label=backport-v3.9.x
actions:
backport:
branches:
- v3.12.x
labels:
- backport-v3.11.x
- backport-v3.10.x
- backport-v3.9.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.11.x based on label
conditions:
- base=v3.12.x
- label=backport-v3.11.x
- label!=backport-v3.10.x
- label!=backport-v3.9.x
actions:
backport:
branches:
- v3.11.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.11.x & v3.10.x based on labels
conditions:
- base=v3.12.x
- label=backport-v3.11.x
- label=backport-v3.10.x
- label!=backport-v3.9.x
actions:
backport:
branches:
- v3.11.x
labels:
- backport-v3.10.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.11.x, v3.10.x & v3.9.x based on labels
conditions:
- base=v3.12.x
- label=backport-v3.11.x
- label=backport-v3.10.x
- label=backport-v3.9.x
actions:
backport:
branches:
- v3.11.x
labels:
- backport-v3.10.x
- backport-v3.9.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.10.x based on label
conditions:
- base=v3.11.x
- label=backport-v3.10.x
- label!=backport-v3.9.x
actions:
backport:
branches:
- v3.10.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.10.x & v3.9.x based on labels
conditions:
- base=v3.11.x
- label=backport-v3.10.x
- label=backport-v3.9.x
actions:
backport:
branches:
- v3.10.x
labels:
- backport-v3.9.x
assignees:
- "{{ author }}"
- name: Automatically backport to v3.9.x based on label
conditions:
- base=v3.10.x
- label=backport-v3.9.x
actions:
backport:
branches:
- v3.9.x
assignees:
- "{{ author }}"
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
name: Check Bazel/Erlang.mk Equivalence (Matrix)
name: Check Bazel/Erlang.mk Equivalence on Release Branches
on:
schedule:
- cron: '0 2 * * *'
workflow_dispatch:
jobs:
check-main:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: main
erlang_version: 26.0
ref: refs/heads/main
erlang_version: 26.2
elixir_version: 1.15
project_version: 3.13.0
project_version: 4.0.0

check-v3_12_x:
check-v4_0_x:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: v3.12.x
erlang_version: 26.0
ref: refs/heads/main
erlang_version: 26.2
elixir_version: 1.15
project_version: 3.12.0
project_version: 4.0.0

check-v3_13_x:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: refs/heads/v3.13.x
erlang_version: 26.2
elixir_version: 1.15
project_version: 3.13.0

check-v3_11_x:
check-v3_12_x:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: v3.11.x
erlang_version: 26.0
ref: refs/heads/v3.12.x
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.11.0
project_version: 3.12.0
Loading

0 comments on commit 5f25df8

Please sign in to comment.