add doc-site-branch to version.asciidoc and settings.go (#35693)

elastic · Jun 9, 2023 · 25adc03 · 25adc03
1 parent 1af70aa
commit 25adc03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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