Skip to content

Commit b59730d

Browse files
committed
rebased changes from main
2 parents 66ec336 + f936919 commit b59730d

File tree

867 files changed

+18902
-4816
lines changed

Some content is hidden

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

867 files changed

+18902
-4816
lines changed

.bazelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,14 @@ build:rbe-25_3 --config=rbe
6868
build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform
6969

7070
build:rbe-26 --config=rbe
71-
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_1_platform
71+
build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_2_platform
7272

7373
build:rbe-26_1 --config=rbe
7474
build:rbe-26_1 --platforms=//bazel/platforms:erlang_linux_26_1_platform
7575

76+
build:rbe-26_2 --config=rbe
77+
build:rbe-26_2 --platforms=//bazel/platforms:erlang_linux_26_2_platform
78+
7679
# no-op config so that --config=local does not error
7780
build:local --color=auto
7881

.github/mergify.yml

Lines changed: 16 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,24 @@ pull_request_rules:
1313
label:
1414
add:
1515
- make
16+
- name: Automatically backport to v3.13.x based on label
17+
conditions:
18+
- base=main
19+
- label=backport-v3.13.x
20+
- label!=backport-v3.12.x
21+
actions:
22+
backport:
23+
branches:
24+
- v3.13.x
25+
labels:
26+
- backport-v3.12.x
27+
assignees:
28+
- "{{ author }}"
1629
- name: Automatically backport to v3.12.x based on label
1730
conditions:
1831
- base=main
1932
- label=backport-v3.12.x
2033
- label!=backport-v3.11.x
21-
- label!=backport-v3.10.x
22-
- label!=backport-v3.9.x
2334
actions:
2435
backport:
2536
branches:
@@ -31,8 +42,6 @@ pull_request_rules:
3142
- base=main
3243
- label=backport-v3.12.x
3344
- label=backport-v3.11.x
34-
- label!=backport-v3.10.x
35-
- label!=backport-v3.9.x
3645
actions:
3746
backport:
3847
branches:
@@ -41,29 +50,25 @@ pull_request_rules:
4150
- backport-v3.11.x
4251
assignees:
4352
- "{{ author }}"
44-
- name: Automatically backport to v3.12.x, v3.11.x & v3.10.x based on labels
53+
- name: Automatically backport to v3.13.x, v3.12.x, v3.11.x based on labels
4554
conditions:
4655
- base=main
56+
- label=backport-v3.13.x
4757
- label=backport-v3.12.x
4858
- label=backport-v3.11.x
49-
- label=backport-v3.10.x
50-
- label!=backport-v3.9.x
5159
actions:
5260
backport:
5361
branches:
5462
- v3.12.x
5563
labels:
5664
- backport-v3.11.x
57-
- backport-v3.10.x
5865
assignees:
5966
- "{{ author }}"
6067
- name: Automatically backport to v3.12.x, v3.11.x, v3.10.x & v3.9.x based on labels
6168
conditions:
6269
- base=main
6370
- label=backport-v3.12.x
6471
- label=backport-v3.11.x
65-
- label=backport-v3.10.x
66-
- label=backport-v3.9.x
6772
actions:
6873
backport:
6974
branches:
@@ -78,8 +83,6 @@ pull_request_rules:
7883
conditions:
7984
- base=v3.12.x
8085
- label=backport-v3.11.x
81-
- label!=backport-v3.10.x
82-
- label!=backport-v3.9.x
8386
actions:
8487
backport:
8588
branches:
@@ -90,62 +93,19 @@ pull_request_rules:
9093
conditions:
9194
- base=v3.12.x
9295
- label=backport-v3.11.x
93-
- label=backport-v3.10.x
94-
- label!=backport-v3.9.x
9596
actions:
9697
backport:
9798
branches:
9899
- v3.11.x
99-
labels:
100-
- backport-v3.10.x
101100
assignees:
102101
- "{{ author }}"
103-
- name: Automatically backport to v3.11.x, v3.10.x & v3.9.x based on labels
102+
- name: Automatically backport to v3.11.x based on labels
104103
conditions:
105104
- base=v3.12.x
106105
- label=backport-v3.11.x
107-
- label=backport-v3.10.x
108-
- label=backport-v3.9.x
109106
actions:
110107
backport:
111108
branches:
112109
- v3.11.x
113-
labels:
114-
- backport-v3.10.x
115-
- backport-v3.9.x
116-
assignees:
117-
- "{{ author }}"
118-
- name: Automatically backport to v3.10.x based on label
119-
conditions:
120-
- base=v3.11.x
121-
- label=backport-v3.10.x
122-
- label!=backport-v3.9.x
123-
actions:
124-
backport:
125-
branches:
126-
- v3.10.x
127-
assignees:
128-
- "{{ author }}"
129-
- name: Automatically backport to v3.10.x & v3.9.x based on labels
130-
conditions:
131-
- base=v3.11.x
132-
- label=backport-v3.10.x
133-
- label=backport-v3.9.x
134-
actions:
135-
backport:
136-
branches:
137-
- v3.10.x
138-
labels:
139-
- backport-v3.9.x
140-
assignees:
141-
- "{{ author }}"
142-
- name: Automatically backport to v3.9.x based on label
143-
conditions:
144-
- base=v3.10.x
145-
- label=backport-v3.9.x
146-
actions:
147-
backport:
148-
branches:
149-
- v3.9.x
150110
assignees:
151111
- "{{ author }}"

.github/workflows/check-build-system-equivalence.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
ref: ${{ inputs.ref || github.ref }}
4747
- name: CONFIGURE ERLANG
48-
uses: erlef/setup-beam@v1.16
48+
uses: erlef/setup-beam@v1.17
4949
with:
5050
otp-version: ${{ env.erlang_version }}
5151
elixir-version: ${{ env.elixir_version }}
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
echo "archives_dir=$(readlink -f bazel-bin)" >> $GITHUB_ENV
6464
- name: UPLOAD package-generic-unix.tar.xz
65-
uses: actions/upload-artifact@v4.0.0
65+
uses: actions/upload-artifact@v4.3.1
6666
with:
6767
name: bazel-package-generic-unix-${{ env.VERSION }}.tar.xz
6868
path: ${{ env.archives_dir }}/package-generic-unix.tar.xz
@@ -79,7 +79,7 @@ jobs:
7979
path: rabbitmq
8080
ref: ${{ inputs.ref || github.ref }}
8181
- name: CONFIGURE ERLANG
82-
uses: erlef/setup-beam@v1.16
82+
uses: erlef/setup-beam@v1.17
8383
with:
8484
otp-version: ${{ env.erlang_version }}
8585
elixir-version: ${{ env.elixir_version }}
@@ -97,7 +97,7 @@ jobs:
9797
PACKAGES_DIR="$PWD/PACKAGES" \
9898
VERSION="$VERSION"
9999
- name: UPLOAD package-generic-unix.tar.xz
100-
uses: actions/upload-artifact@v4.0.0
100+
uses: actions/upload-artifact@v4.3.1
101101
with:
102102
name: make-package-generic-unix-${{ env.VERSION }}.tar.xz
103103
path: PACKAGES/rabbitmq-server-generic-unix-*.tar.xz
@@ -117,7 +117,7 @@ jobs:
117117
path: rabbitmq-server
118118
ref: ${{ inputs.ref || github.ref }}
119119
- name: CONFIGURE ERLANG
120-
uses: erlef/setup-beam@v1.16
120+
uses: erlef/setup-beam@v1.17
121121
with:
122122
otp-version: ${{ env.erlang_version }}
123123
elixir-version: ${{ env.elixir_version }}

.github/workflows/gazelle-scheduled.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
bazel run gazelle
2727
- name: CREATE PULL REQUEST
28-
uses: peter-evans/create-pull-request@v5.0.2
28+
uses: peter-evans/create-pull-request@v6.0.0
2929
with:
3030
token: ${{ secrets.REPO_SCOPED_TOKEN }}
3131
committer: GitHub <[email protected]>

.github/workflows/gazelle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: |
2121
bazel run gazelle
2222
- name: CREATE PULL REQUEST
23-
uses: peter-evans/create-pull-request@v5.0.2
23+
uses: peter-evans/create-pull-request@v6.0.0
2424
with:
2525
token: ${{ secrets.REPO_SCOPED_TOKEN }}
2626
committer: GitHub <[email protected]>

.github/workflows/oci-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: echo ${{ steps.buildx.outputs.platforms }}
2626

2727
- name: Cache Docker layers
28-
uses: actions/cache@v3.3.2
28+
uses: actions/cache@v4.0.0
2929
with:
3030
path: /tmp/.buildx-cache
3131
key: ${{ runner.os }}-${{ matrix.image_tag_suffix }}-buildx-${{ github.event.pull_request.head.sha || github.sha }}

.github/workflows/oci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
- image_tag_suffix: otp-min-bazel
3737
otp_version_id: 26_1
3838
- image_tag_suffix: otp-max-bazel
39-
otp_version_id: 26_1
39+
otp_version_id: 26_2
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v4
4343

4444
- name: Mount Bazel Cache
45-
uses: actions/cache@v3.3.2
45+
uses: actions/cache@v4.0.0
4646
with:
4747
path: "/home/runner/repo-cache/"
4848
key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}

.github/workflows/perform-bazel-execution-comparison.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
--config=rbe-${{ matrix.erlang_version }} \
3838
--execution_log_binary_file=/tmp/exec.log
3939
- name: SAVE EXECUTION LOG BINARY
40-
uses: actions/upload-artifact@v4.0.0
40+
uses: actions/upload-artifact@v4.3.1
4141
with:
4242
name: execution-log-binary-A
4343
path: /tmp/exec.log
@@ -72,7 +72,7 @@ jobs:
7272
--config=rbe-${{ matrix.erlang_version }} \
7373
--execution_log_binary_file=/tmp/exec.log
7474
- name: SAVE EXECUTION LOG BINARY
75-
uses: actions/upload-artifact@v4.0.0
75+
uses: actions/upload-artifact@v4.3.1
7676
with:
7777
name: execution-log-binary-B
7878
path: /tmp/exec.log
@@ -87,7 +87,7 @@ jobs:
8787
repository: bazelbuild/bazel
8888
path: bazel
8989
- name: MOUNT BAZEL CACHE
90-
uses: actions/cache@v3.3.2
90+
uses: actions/cache@v4.0.0
9191
with:
9292
path: "/home/runner/.cache/bazel"
9393
key: bazel
@@ -105,7 +105,7 @@ jobs:
105105
--output_path=/tmp/execution-log-binary-A.log.txt \
106106
--output_path=/tmp/execution-log-binary-B.log.txt
107107
- name: SAVE PARSED LOGS
108-
uses: actions/upload-artifact@v4.0.0
108+
uses: actions/upload-artifact@v4.3.1
109109
with:
110110
name: parsed-logs
111111
path: /tmp/execution-log-binary-*.log.txt

.github/workflows/rabbitmq_peer_discovery_aws.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
include:
1919
- image_tag_suffix: otp-max-bazel
20-
otp_version_id: 26_1
20+
otp_version_id: 26_2
2121
timeout-minutes: 45
2222
steps:
2323
- name: CHECKOUT REPOSITORY
@@ -30,7 +30,7 @@ jobs:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
wait-interval: 30 # seconds
3232
- name: MOUNT BAZEL CACHE
33-
uses: actions/cache@v3.3.2
33+
uses: actions/cache@v4.0.0
3434
with:
3535
path: "/home/runner/repo-cache/"
3636
key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}

.github/workflows/test-authnz.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Authentication/Authorization backends
1+
name: Test Authentication/Authorization backends via mutiple messaging protocols
22
on:
33
push:
44
branches:
@@ -48,13 +48,13 @@ jobs:
4848
uses: actions/checkout@v4
4949

5050
- name: Configure OTP & Elixir
51-
uses: erlef/setup-beam@v1.16
51+
uses: erlef/setup-beam@v1.17
5252
with:
5353
otp-version: ${{ matrix.erlang_version }}
5454
elixir-version: ${{ matrix.elixir_version }}
5555

5656
- name: Mount Bazel Cache
57-
uses: actions/cache@v3.3.2
57+
uses: actions/cache@v4.0.0
5858
with:
5959
path: "/home/runner/repo-cache/"
6060
key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
@@ -104,7 +104,7 @@ jobs:
104104
105105
- name: Upload Test Artifacts
106106
if: always()
107-
uses: actions/upload-artifact@v4.0.0
107+
uses: actions/upload-artifact@v4.3.1
108108
with:
109109
name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
110110
path: |

0 commit comments

Comments
 (0)