From 8b83294c0f5a3e30b41050d442bf594ec59f82e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Mon, 29 Sep 2025 16:56:21 +0300 Subject: [PATCH] release: adjust doc_link() for the post source-available world There is no more separate enterprise product and the doc urls are slightly different. (cherry picked from commit 15a4a9936b2740afb8dc35b70ee504a00ef0fab3) --- release.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/release.cc b/release.cc index 20a41d5c4b..209c91556f 100644 --- a/release.cc +++ b/release.cc @@ -15,7 +15,6 @@ #include -static const char scylla_product_str[] = SCYLLA_PRODUCT; static const char scylla_version_str[] = SCYLLA_VERSION; static const char scylla_release_str[] = SCYLLA_RELEASE; static const char scylla_build_mode_str[] = SCYLLA_BUILD_MODE_STR; @@ -31,12 +30,9 @@ std::string scylla_build_mode() } std::string doc_link(std::string_view url_tail) { - const std::string_view product = scylla_product_str; const std::string_view version = scylla_version_str; - const auto prefix = product == "scylla-enterprise" ? "enterprise" : "opensource"; - - std::string branch = product == "scylla-enterprise" ? "enterprise" : "master"; + std::string branch = "master"; if (!version.ends_with("~dev")) { std::vector components; boost::split(components, version, boost::algorithm::is_any_of(".")); @@ -45,7 +41,7 @@ std::string doc_link(std::string_view url_tail) { branch = fmt::format("branch-{}.{}", components[0], components[1]); } - return fmt::format("https://{}.docs.scylladb.com/{}/{}", prefix, branch, url_tail); + return fmt::format("https://docs.scylladb.com/manual/{}/{}", branch, url_tail); } // get the version number into writeable memory, so we can grep for it if we get a core dump