From 25adc03b601e4016e2e0dd674c2e447bb702ba4c Mon Sep 17 00:00:00 2001 From: Anderson Queiroz Date: Fri, 9 Jun 2023 11:56:39 +0200 Subject: [PATCH] add doc-site-branch to version.asciidoc and settings.go (#35693) --- dev-tools/mage/settings.go | 9 +++++---- libbeat/docs/version.asciidoc | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index 0fe010877f0..2e82c6d6c0d 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -386,10 +386,11 @@ func beatVersion() (string, error) { } var ( - beatDocBranchRegex = regexp.MustCompile(`(?m)doc-branch:\s*([^\s]+)\r?$`) - beatDocBranchValue string - beatDocBranchErr error - beatDocBranchOnce sync.Once + beatDocBranchRegex = regexp.MustCompile(`(?m)doc-branch:\s*([^\s]+)\r?$`) + beatDocSiteBranchRegex = regexp.MustCompile(`(?m)doc-site-branch:\s*([^\s]+)\r?$`) + beatDocBranchValue string + beatDocBranchErr error + beatDocBranchOnce sync.Once ) // BeatDocBranch returns the documentation branch name associated with the diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 191e466d955..d3261c6d65c 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,5 +1,8 @@ :stack-version: 8.9.0 :doc-branch: main +// FIXME: once elastic.co docs have been switched over to use `main`, remove +// the `doc-site-branch` line below as well as any references to it in the code. +:doc-site-branch: master :go-version: 1.19.9 :release-state: unreleased :python: 3.7