Secondary umbrella: resolve a conflict

michaelklishin · michaelklishin · commit 76e0da11d767 · 2024-06-19T13:45:15.000-04:00
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
@@ -31,6 +31,6 @@ def secondary_umbrella():
         strip_prefix = "rabbitmq_server-3.11.18",
         # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
         urls = [
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz"
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
         ],
     )

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ def secondary_umbrella():`
`31`	`31`	`strip_prefix = "rabbitmq_server-3.11.18",`
`32`	`32`	`# This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.`
`33`	`33`	`urls = [`
`34`		`- "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz"`
	`34`	`+ "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",`
`35`	`35`	`],`
`36`	`36`	`)`