diff options
| author | David Ansari <david.ansari@gmx.de> | 2022-10-19 08:34:31 +0000 |
|---|---|---|
| committer | David Ansari <david.ansari@gmx.de> | 2022-10-19 10:56:22 +0200 |
| commit | 1f6ead8055297dd5b798a60a00bf2e647753e693 (patch) | |
| tree | 3ddc75df5df0500c9219815972ab7bba905958db | |
| parent | a8a0c38b7ea886b3cc014b5bc013e3fa7b670fed (diff) | |
| download | rabbitmq-server-git-1f6ead8055297dd5b798a60a00bf2e647753e693.tar.gz | |
Make main branch use 3.11.2 as mixed version tests
The 3.11.2 artifact already got uploaded to AWS.
| -rw-r--r-- | .github/workflows/secondary-umbrella.yaml | 16 | ||||
| -rw-r--r-- | MODULE.bazel | 2 | ||||
| -rw-r--r-- | bazel/bzlmod/secondary_umbrella.bzl | 6 | ||||
| -rw-r--r-- | rabbitmq.bzl | 4 |
4 files changed, 22 insertions, 6 deletions
diff --git a/.github/workflows/secondary-umbrella.yaml b/.github/workflows/secondary-umbrella.yaml index 6078969f1a..f61216d14a 100644 --- a/.github/workflows/secondary-umbrella.yaml +++ b/.github/workflows/secondary-umbrella.yaml @@ -97,6 +97,22 @@ jobs: + "+nowarn_export_all", "-DINSTR_MOD=gm", ] + - erlang_major: "25" + tag: v3.11.2 + patch: | + diff --git a/rabbitmq.bzl b/rabbitmq.bzl + index d9e815c72b..f5c10a2ce5 100644 + --- a/rabbitmq.bzl + +++ b/rabbitmq.bzl + @@ -28,6 +28,8 @@ STARTS_BACKGROUND_BROKER_TAG = "starts-background-broker" + MIXED_VERSION_CLUSTER_TAG = "mixed-version-cluster" + + RABBITMQ_ERLC_OPTS = DEFAULT_ERLC_OPTS + [ + + "-DTEST=1", + + "+nowarn_export_all", + "-DINSTR_MOD=gm", + ] + timeout-minutes: 20 steps: - name: Checkout Repository (Secondary Umbrella tag) diff --git a/MODULE.bazel b/MODULE.bazel index 7dae28d396..f05069f695 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -407,5 +407,5 @@ secondary_umbrella = use_extension( use_repo( secondary_umbrella, - "rabbitmq-server-generic-unix-3.10", + "rabbitmq-server-generic-unix-3.11", ) diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl index 3a122b4ff7..3626ed98a8 100644 --- a/bazel/bzlmod/secondary_umbrella.bzl +++ b/bazel/bzlmod/secondary_umbrella.bzl @@ -25,13 +25,13 @@ EOF def secondary_umbrella(): http_archive( - name = "rabbitmq-server-generic-unix-3.10", + name = "rabbitmq-server-generic-unix-3.11", build_file = "@//:BUILD.package_generic_unix", patch_cmds = [ADD_PLUGINS_DIR_BUILD_FILE], - strip_prefix = "rabbitmq_server-3.10.7", + strip_prefix = "rabbitmq_server-3.11.2", # This file if produced by the .github/workflows/secondary-umbrella.yaml # GitHub Actions workflow. urls = [ - "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/package-generic-unix-for-mixed-version-testing-v3.10.7.tar.xz", + "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/package-generic-unix-for-mixed-version-testing-v3.11.2.tar.xz", ], ) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index d9e815c72b..186186ef37 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -274,12 +274,12 @@ def rabbitmq_integration_suite( "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package), "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package), "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package), - "RABBITMQ_RUN_SECONDARY": "$TEST_SRCDIR/.secondary_umbrella.rabbitmq-server-generic-unix-3.10/rabbitmq-run", + "RABBITMQ_RUN_SECONDARY": "$TEST_SRCDIR/.secondary_umbrella.rabbitmq-server-generic-unix-3.11/rabbitmq-run", "LANG": "C.UTF-8", }.items() + test_env.items()), tools = [ ":rabbitmq-for-tests-run", - "@rabbitmq-server-generic-unix-3.10//:rabbitmq-run", + "@rabbitmq-server-generic-unix-3.11//:rabbitmq-run", ] + tools, runtime_deps = [ "//bazel/elixir:erlang_app", |