Skip to content

Commit b5d5316

Browse files
michaelklishinmergify[bot]
authored andcommitted
web_mqtt_shared_SUITE: propagate flow_classic_queue to mqtt_shared_SUITE #12907 12906
(cherry picked from commit f3540ee) # Conflicts: # .github/workflows/check-build-system-equivalence.yaml # .github/workflows/gazelle-scheduled.yaml # .github/workflows/oci-arm64-make.yaml # .github/workflows/oci-make.yaml # .github/workflows/templates/test.template.yaml # .github/workflows/test-authnz.yaml # .github/workflows/test-make-target.yaml # .github/workflows/test-make.yaml # .github/workflows/test-management-ui-for-pr.yaml # .github/workflows/test-management-ui.yaml # .github/workflows/test-mixed-versions.yaml # .github/workflows/test-plugin-mixed.yaml # .github/workflows/test-plugin.yaml # .github/workflows/test.yaml # COMMUNITY_SUPPORT.md # MODULE.bazel # Makefile # bazel/BUILD.horus # bazel/BUILD.redbug # bazel/bzlmod/secondary_umbrella.bzl # deps/amqp10_client/BUILD.bazel # deps/amqp10_client/app.bzl # deps/amqp10_client/src/amqp10_client.erl # deps/amqp10_client/src/amqp10_client_connection.erl # deps/amqp10_client/src/amqp10_client_frame_reader.erl # deps/amqp10_client/src/amqp10_client_session.erl # deps/amqp10_client/src/amqp10_client_types.erl # deps/amqp10_client/src/amqp10_msg.erl # deps/amqp10_client/test/system_SUITE.erl # deps/amqp10_common/app.bzl # deps/amqp_client/src/amqp_network_connection.erl # deps/oauth2_client/app.bzl # deps/oauth2_client/include/oauth2_client.hrl # deps/oauth2_client/src/oauth2_client.erl # deps/oauth2_client/test/system_SUITE.erl # deps/oauth2_client/test/unit_SUITE.erl # deps/rabbit/BUILD.bazel # deps/rabbit/Makefile # deps/rabbit/app.bzl # deps/rabbit/ct.test.spec # deps/rabbit/include/rabbit_amqp.hrl # deps/rabbit/src/mc.erl # deps/rabbit/src/mc_amqp.erl # deps/rabbit/src/mc_amqpl.erl # deps/rabbit/src/mc_compat.erl # deps/rabbit/src/mc_util.erl # deps/rabbit/src/rabbit_access_control.erl # deps/rabbit/src/rabbit_amqp_management.erl # deps/rabbit/src/rabbit_amqp_reader.erl # deps/rabbit/src/rabbit_amqp_session.erl # deps/rabbit/src/rabbit_amqp_util.erl # deps/rabbit/src/rabbit_amqp_writer.erl # deps/rabbit/src/rabbit_amqqueue.erl # deps/rabbit/src/rabbit_binding.erl # deps/rabbit/src/rabbit_channel.erl # deps/rabbit/src/rabbit_core_ff.erl # deps/rabbit/src/rabbit_db_binding.erl # deps/rabbit/src/rabbit_db_cluster.erl # deps/rabbit/src/rabbit_db_exchange.erl # deps/rabbit/src/rabbit_depr_ff_extra.erl # deps/rabbit/src/rabbit_deprecated_features.erl # deps/rabbit/src/rabbit_exchange.erl # deps/rabbit/src/rabbit_feature_flags.erl # deps/rabbit/src/rabbit_ff_controller.erl # deps/rabbit/src/rabbit_ff_extra.erl # deps/rabbit/src/rabbit_ff_registry.erl # deps/rabbit/src/rabbit_ff_registry_factory.erl # deps/rabbit/src/rabbit_ff_registry_wrapper.erl # deps/rabbit/src/rabbit_global_counters.erl # deps/rabbit/src/rabbit_khepri.erl # deps/rabbit/src/rabbit_mnesia.erl # deps/rabbit/src/rabbit_networking.erl # deps/rabbit/src/rabbit_prelaunch_feature_flags.erl # deps/rabbit/src/rabbit_queue_type.erl # deps/rabbit/src/rabbit_quorum_queue.erl # deps/rabbit/src/rabbit_reader.erl # deps/rabbit/src/rabbit_stream_queue.erl # deps/rabbit/test/amqp_address_SUITE.erl # deps/rabbit/test/amqp_auth_SUITE.erl # deps/rabbit/test/amqp_client_SUITE.erl # deps/rabbit/test/amqp_system_SUITE.erl # deps/rabbit/test/dead_lettering_SUITE.erl # deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl # deps/rabbit/test/feature_flags_v2_SUITE.erl # deps/rabbit/test/mc_unit_SUITE.erl # deps/rabbit/test/quorum_queue_SUITE.erl # deps/rabbit/test/rabbit_db_binding_SUITE.erl # deps/rabbit/test/rabbit_db_queue_SUITE.erl # deps/rabbit/test/topic_permission_SUITE.erl # deps/rabbit_common/mk/rabbitmq-early-plugin.mk # deps/rabbit_common/src/rabbit_core_metrics.erl # deps/rabbit_common/src/rabbit_env.erl # deps/rabbit_common/src/rabbit_event.erl # deps/rabbit_common/src/rabbit_ssl_options.erl # deps/rabbit_common/test/rabbit_env_SUITE.erl # deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl # deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot/pom.xml # deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot_kotlin/pom.xml # deps/rabbitmq_auth_backend_http/src/rabbit_auth_backend_http.erl # deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl # deps/rabbitmq_auth_backend_oauth2/BUILD.bazel # deps/rabbitmq_auth_backend_oauth2/Makefile # deps/rabbitmq_auth_backend_oauth2/README.md # deps/rabbitmq_auth_backend_oauth2/app.bzl # deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema # deps/rabbitmq_auth_backend_oauth2/src/rabbit_auth_backend_oauth2.erl # deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl # deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_scope.erl # deps/rabbitmq_auth_backend_oauth2/src/uaa_jwks.erl # deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt.erl # deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt_jwt.erl # deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets # deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl # deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_schema_SUITE.erl # deps/rabbitmq_auth_backend_oauth2/test/system_SUITE.erl # deps/rabbitmq_auth_backend_oauth2/test/unit_SUITE.erl # deps/rabbitmq_cli/Makefile # deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_connections_command.ex # deps/rabbitmq_event_exchange/BUILD.bazel # deps/rabbitmq_event_exchange/Makefile # deps/rabbitmq_event_exchange/README.md # deps/rabbitmq_event_exchange/app.bzl # deps/rabbitmq_event_exchange/priv/schema/rabbitmq_event_exchange.schema # deps/rabbitmq_event_exchange/src/rabbit_exchange_type_event.erl # deps/rabbitmq_event_exchange/test/config_schema_SUITE_data/rabbitmq_event_exchange.snippets # deps/rabbitmq_event_exchange/test/system_SUITE.erl # deps/rabbitmq_management/.gitignore # deps/rabbitmq_management/BUILD.bazel # deps/rabbitmq_management/Makefile # deps/rabbitmq_management/app.bzl # deps/rabbitmq_management/priv/schema/rabbitmq_management.schema # deps/rabbitmq_management/priv/www/css/main.css # deps/rabbitmq_management/priv/www/js/dispatcher.js # deps/rabbitmq_management/priv/www/js/global.js # deps/rabbitmq_management/priv/www/js/main.js # deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js # deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs # deps/rabbitmq_management/priv/www/js/tmpl/connections.ejs # deps/rabbitmq_management/priv/www/js/tmpl/deprecated-features.ejs # deps/rabbitmq_management/priv/www/js/tmpl/feature-flags.ejs # deps/rabbitmq_management/src/rabbit_mgmt_dispatcher.erl # deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl # deps/rabbitmq_management/test/clustering_prop_SUITE.erl # deps/rabbitmq_management/test/config_schema_SUITE_data/rabbitmq_management.snippets # deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl # deps/rabbitmq_management/test/rabbit_mgmt_wm_auth_SUITE.erl # deps/rabbitmq_management_agent/src/rabbit_mgmt_ff.erl # deps/rabbitmq_mqtt/BUILD.bazel # deps/rabbitmq_mqtt/Makefile # deps/rabbitmq_mqtt/src/mc_mqtt.erl # deps/rabbitmq_mqtt/src/rabbit_mqtt.erl # deps/rabbitmq_mqtt/src/rabbit_mqtt_ff.erl # deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl # deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl # deps/rabbitmq_mqtt/test/java_SUITE_data/pom.xml # deps/rabbitmq_mqtt/test/mc_mqtt_SUITE.erl # deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl # deps/rabbitmq_prometheus/BUILD.bazel # deps/rabbitmq_prometheus/app.bzl # deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_global_metrics_collector.erl # deps/rabbitmq_prometheus/src/rabbit_prometheus_dispatcher.erl # deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl # deps/rabbitmq_stream/test/protocol_interop_SUITE.erl # deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml # deps/rabbitmq_stream_management/priv/www/js/tmpl/streamConnection.ejs # deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml # deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl # deps/rabbitmq_web_mqtt/test/web_mqtt_shared_SUITE.erl # moduleindex.yaml # rabbitmq-components.mk # rabbitmq.bzl # release-notes/4.0.1.md # selenium/.gitignore # selenium/bin/components/devkeycloak # selenium/bin/components/fakeportal # selenium/bin/components/fakeproxy # selenium/bin/components/prodkeycloak # selenium/bin/components/rabbitmq # selenium/bin/components/uaa # selenium/bin/gen-env-file # selenium/bin/suite_template # selenium/fakeportal/app.js # selenium/full-suite-authnz-messaging # selenium/full-suite-management-ui # selenium/package.json # selenium/run-suites.sh # selenium/short-suite-management-ui # selenium/suites/authnz-messaging/auth-internal-backend.sh # selenium/suites/authnz-mgt/oauth-with-uaa.sh # selenium/test/amqp.js # selenium/test/authnz-msg-protocols/amqp10.js # selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker # selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local # selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker # selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local # selenium/test/authnz-msg-protocols/env.docker.devkeycloak # selenium/test/authnz-msg-protocols/env.docker.prodkeycloak # selenium/test/authnz-msg-protocols/env.local.devkeycloak # selenium/test/authnz-msg-protocols/env.local.prodkeycloak # selenium/test/authnz-msg-protocols/mqtt.js # selenium/test/basic-auth/env.local # selenium/test/basic-auth/imports/users.json # selenium/test/basic-auth/rabbitmq.conf # selenium/test/connections/amqp10/sessions-for-monitoring-user.js # selenium/test/env.docker # selenium/test/env.local # selenium/test/env.tls.docker # selenium/test/env.tls.local # selenium/test/exchanges/management.js # selenium/test/multi-oauth/env.local # selenium/test/multi-oauth/env.local.devkeycloak # selenium/test/multi-oauth/env.local.prodkeycloak # selenium/test/multi-oauth/rabbitmq.tls.conf # selenium/test/oauth/env.docker.fakeportal # selenium/test/oauth/env.docker.fakeproxy # selenium/test/oauth/env.docker.uaa # selenium/test/oauth/env.local # selenium/test/oauth/env.local.fakeportal # selenium/test/oauth/env.local.keycloak # selenium/test/oauth/env.local.uaa # selenium/test/oauth/rabbitmq.conf # selenium/test/oauth/rabbitmq.keycloak-mgt-oauth-provider.conf # selenium/test/oauth/rabbitmq.tls.conf # selenium/test/oauth/uaa/uaa.yml # selenium/test/pageobjects/BasePage.js # selenium/test/pageobjects/OverviewPage.js
1 parent 5d2cd04 commit b5d5316

File tree

266 files changed

+16264
-1
lines changed

Some content is hidden

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

266 files changed

+16264
-1
lines changed

.github/DISCUSSION_TEMPLATE/ideas.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
title: "[Suggestion] "
2+
body:
3+
- type: markdown
4+
attributes:
5+
value: |
6+
## Before We Start
7+
8+
Please provide reasonably detailed responses to the question below to help the Core Team and maintainers
9+
to understand how you run RabbitMQ and why you'd like to see the suggested changes.
10+
- type: markdown
11+
attributes:
12+
value: |
13+
## Relevant Details
14+
- type: dropdown
15+
id: rabbitmq_series
16+
attributes:
17+
label: RabbitMQ series
18+
options:
19+
- 4.0.x
20+
- 4.1.x
21+
validations:
22+
required: true
23+
- type: input
24+
id: os
25+
attributes:
26+
label: Operating system (distribution) used
27+
description: What OS or distribution do you run RabbitMQ on?
28+
validations:
29+
required: true
30+
- type: dropdown
31+
id: deployment_type
32+
attributes:
33+
label: How is RabbitMQ deployed?
34+
options:
35+
- Community Docker image
36+
- Debian package
37+
- RPM package
38+
- Generic binary package
39+
- Kubernetes Operator(s) from Team RabbitMQ
40+
- Bitnami Helm chart
41+
- Chocolatey package
42+
- Windows installer
43+
- Windows binary package
44+
- RabbitMQ-as-a-Service from a public cloud provider
45+
- Other
46+
validations:
47+
required: true
48+
- type: textarea
49+
id: details
50+
attributes:
51+
label: What would you like to suggest for a future version of RabbitMQ?
52+
description: Please take the time to explain how you use RabbitMQ and why this change is important
53+
validations:
54+
required: true

.github/DISCUSSION_TEMPLATE/other.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
title: "[Other] "
2+
body:
3+
- type: markdown
4+
attributes:
5+
value: |
6+
## Before We Start
7+
8+
This category exists for free form questions where deployment details are less relevant, e.g. application and topology
9+
design kind of questions. Please provide a reasonably detailed description of what you are trying to do with RabbitMQ.
10+
- type: checkboxes
11+
attributes:
12+
label: Community Support Policy
13+
description:
14+
options:
15+
- label: I have read [RabbitMQ's Community Support Policy](https://github.com/rabbitmq/rabbitmq-server/blob/main/COMMUNITY_SUPPORT.md)
16+
required: true
17+
- type: markdown
18+
attributes:
19+
value: |
20+
## Relevant Details
21+
- type: dropdown
22+
id: rabbitmq_version
23+
attributes:
24+
label: RabbitMQ version used
25+
options:
26+
- 4.0.3
27+
- 3.13.7 or older
28+
validations:
29+
required: true
30+
- type: dropdown
31+
id: deployment_type
32+
attributes:
33+
label: How is RabbitMQ deployed?
34+
options:
35+
- Community Docker image
36+
- Debian package
37+
- RPM package
38+
- Generic binary package
39+
- Kubernetes Operator(s) from Team RabbitMQ
40+
- Bitnami Helm chart
41+
- Chocolatey package
42+
- Windows installer
43+
- Windows binary package
44+
- RabbitMQ-as-a-Service from a public cloud provider
45+
- Other
46+
validations:
47+
required: true
48+
- type: textarea
49+
id: details
50+
attributes:
51+
label: Steps to reproduce the behavior in question
52+
description: What specific steps need to be performed in order to reproduce this behavior? Why?
53+
validations:
54+
required: true
+209
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
title: "[Questions] "
2+
body:
3+
- type: markdown
4+
attributes:
5+
value: |
6+
## Before We Start
7+
8+
Please provide reasonably detailed responses to the question below to help others help you.
9+
10+
If you omit relevant information, those trying to reproduce what you are about to report will have to guess.
11+
Guessing is a very time consuming, and therefore expensive, approach to troubleshooting distributed messaging infrastructure.
12+
- type: checkboxes
13+
attributes:
14+
label: Community Support Policy
15+
description:
16+
options:
17+
- label: I have read [RabbitMQ's Community Support Policy](https://github.com/rabbitmq/rabbitmq-server/blob/main/COMMUNITY_SUPPORT.md)
18+
required: true
19+
- label: I run RabbitMQ 4.x, the only series currently covered by [community support](https://www.rabbitmq.com/release-information)
20+
required: true
21+
- label: I promise to provide all relevant information (versions, logs from all nodes, rabbitmq-diagnostics output, detailed reproduction steps)
22+
required: true
23+
- type: markdown
24+
attributes:
25+
value: |
26+
## Relevant Details
27+
- type: dropdown
28+
id: rabbitmq_version
29+
attributes:
30+
label: RabbitMQ version used
31+
options:
32+
- 4.0.4
33+
- 4.0.3
34+
validations:
35+
required: true
36+
- type: dropdown
37+
id: erlang_version
38+
attributes:
39+
label: Erlang version used
40+
options:
41+
- 26.2.x
42+
- 26.1.x
43+
- 26.0.x
44+
validations:
45+
required: true
46+
- type: input
47+
id: os
48+
attributes:
49+
label: Operating system (distribution) used
50+
description: What OS or distribution do you run RabbitMQ on?
51+
validations:
52+
required: true
53+
- type: dropdown
54+
id: deployment_type
55+
attributes:
56+
label: How is RabbitMQ deployed?
57+
options:
58+
- Community Docker image
59+
- Debian package
60+
- RPM package
61+
- Generic binary package
62+
- Kubernetes Operator(s) from Team RabbitMQ
63+
- Bitnami Helm chart
64+
- Chocolatey package
65+
- Windows installer
66+
- Windows binary package
67+
- RabbitMQ-as-a-Service from a public cloud provider
68+
- Other
69+
validations:
70+
required: true
71+
- type: textarea
72+
id: diagnostics_status
73+
attributes:
74+
label: rabbitmq-diagnostics status output
75+
value: |
76+
See https://www.rabbitmq.com/docs/cli to learn how to use rabbitmq-diagnostics
77+
<details>
78+
79+
```
80+
# PASTE OUTPUT HERE, BETWEEN BACKTICKS
81+
```
82+
</details>
83+
validations:
84+
required: true
85+
- type: textarea
86+
id: rabbitmq_logs
87+
attributes:
88+
label: Logs from node 1 (with sensitive values edited out)
89+
description: Relevant RabbitMQ logs with sensitive values edited out
90+
value: |
91+
See https://www.rabbitmq.com/docs/logging to learn how to collect logs
92+
<details>
93+
94+
```
95+
# PASTE LOG HERE, BETWEEN BACKTICKS
96+
```
97+
</details>
98+
validations:
99+
required: true
100+
- type: textarea
101+
id: logs_node_2
102+
attributes:
103+
label: Logs from node 2 (if applicable, with sensitive values edited out)
104+
description: Relevant RabbitMQ logs with sensitive values edited out
105+
value: |
106+
See https://www.rabbitmq.com/docs/logging to learn how to collect logs
107+
<details>
108+
109+
```
110+
# PASTE LOG HERE, BETWEEN BACKTICKS
111+
```
112+
</details>
113+
validations:
114+
required: false
115+
- type: textarea
116+
id: logs_node_3
117+
attributes:
118+
label: Logs from node 3 (if applicable, with sensitive values edited out)
119+
description: Relevant RabbitMQ logs with sensitive values edited out
120+
value: |
121+
See https://www.rabbitmq.com/docs/logging to learn how to collect logs
122+
<details>
123+
124+
```
125+
# PASTE LOG HERE, BETWEEN BACKTICKS
126+
```
127+
</details>
128+
validations:
129+
required: false
130+
- type: textarea
131+
id: rabbitmq_conf
132+
attributes:
133+
label: rabbitmq.conf
134+
description: rabbitmq.conf contents
135+
value: |
136+
See https://www.rabbitmq.com/docs/configure#config-location to learn how to find rabbitmq.conf file location
137+
<details>
138+
139+
```
140+
# PASTE rabbitmq.conf HERE, BETWEEN BACKTICKS
141+
```
142+
</details>
143+
validations:
144+
required: true
145+
- type: textarea
146+
id: deployment_steps
147+
attributes:
148+
label: Steps to deploy RabbitMQ cluster
149+
description: How would you explain how you deploy RabbitMQ to a new colleague?
150+
validations:
151+
required: true
152+
- type: textarea
153+
id: reproduction_steps
154+
attributes:
155+
label: Steps to reproduce the behavior in question
156+
description: What specific steps need to be performed in order to reproduce this behavior? Why?
157+
validations:
158+
required: true
159+
- type: textarea
160+
id: advanced_config
161+
attributes:
162+
label: advanced.config
163+
description: advanced.config contents (if applicable)
164+
value: |
165+
See https://www.rabbitmq.com/docs/configure#config-location to learn how to find advanced.config file location
166+
<details>
167+
168+
```
169+
# PASTE advanced.config HERE, BETWEEN BACKTICKS
170+
```
171+
</details>
172+
validations:
173+
required: false
174+
- type: textarea
175+
id: app_code
176+
attributes:
177+
label: Application code
178+
description: Relevant messaging-related parts of application code
179+
value: |
180+
<details>
181+
182+
```python
183+
# PASTE CODE HERE, BETWEEN BACKTICKS
184+
```
185+
</details>
186+
validations:
187+
required: false
188+
- type: textarea
189+
id: k8s_deployment
190+
attributes:
191+
label: Kubernetes deployment file
192+
description: Kubernetes deployment YAML that demonstrates how RabbitMQ is deployed (if applicable)
193+
value: |
194+
<details>
195+
196+
```yaml
197+
# Relevant parts of K8S deployment that demonstrate how RabbitMQ is deployed
198+
# PASTE YAML HERE, BETWEEN BACKTICKS
199+
```
200+
</details>
201+
validations:
202+
required: false
203+
- type: textarea
204+
id: question
205+
attributes:
206+
label: What problem are you trying to solve?
207+
description: and why?
208+
validations:
209+
required: true

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

+4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ on:
2323
elixir_version:
2424
description: 'Elixir version to build with'
2525
required: true
26+
<<<<<<< HEAD
2627
default: "1.17"
28+
=======
29+
default: "1.15"
30+
>>>>>>> f3540ee7d2 (web_mqtt_shared_SUITE: propagate flow_classic_queue to mqtt_shared_SUITE #12907 12906)
2731
project_version:
2832
description: 'PROJECT_VERSION used for make'
2933
required: true

.github/workflows/gazelle-scheduled.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ jobs:
1212
matrix:
1313
target_branch:
1414
- main
15+
<<<<<<< HEAD
1516
- v3.12.x
1617
- v3.11.x
1718
- v3.10.x
19+
=======
20+
- v4.0.x
21+
- v3.13.x
22+
- v3.12.x
23+
>>>>>>> f3540ee7d2 (web_mqtt_shared_SUITE: propagate flow_classic_queue to mqtt_shared_SUITE #12907 12906)
1824
timeout-minutes: 10
1925
steps:
2026
- name: CHECKOUT REPOSITORY

.github/workflows/oci-arm64-make.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ jobs:
4747
- name: make package-generic-unix
4848
if: steps.authorized.outputs.authorized == 'true'
4949
run: |
50+
<<<<<<< HEAD
5051
make package-generic-unix PROJECT_VERSION=4.0.0
52+
=======
53+
make package-generic-unix PROJECT_VERSION=4.1.0-alpha.1
54+
>>>>>>> f3540ee7d2 (web_mqtt_shared_SUITE: propagate flow_classic_queue to mqtt_shared_SUITE #12907 12906)
5155
- name: Upload package-generic-unix
5256
if: steps.authorized.outputs.authorized == 'true'
5357
uses: actions/[email protected]

0 commit comments

Comments
 (0)