diff --git a/doc/Makefile b/doc/Makefile index 7154ba5ed..44b959e90 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,9 +2,9 @@ current_dir := $(dir $(abspath $(firstword $(MAKEFILE_LIST)))) # Set the path prefix and MicroCloud component versions corresponding to each MicroCloud docs version PATH_PREFIX = /microcloud/latest/ -LXDVERSION = origin/main -MICROCEPHVERSION = origin/main -MICROOVNVERSION = origin/main +LXDVERSION = origin/stable-6 +MICROCEPHVERSION = e2fac9a75f140249aa5312a99e85c799f9125557 # origin/main. +MICROOVNVERSION = origin/branch-26.03 SPHINX_DIR ?= .sphinx SPHINX_OPTS ?= -c . -d $(SPHINX_DIR)/.doctrees -j auto @@ -248,7 +248,7 @@ serve: html # `serve-microcloud` rebuilds the MicroCloud docs as a stand-alone doc set and serves them. serve-microcloud: microcloud cd "$(DOCS_BUILDDIR)"; python3 -m http.server --bind $(SPHINX_HOST) $(SPHINX_PORT) - + clean: clean-integrate clean-doc @test ! -e "$(DOCS_VENVDIR)" -o -d "$(DOCS_VENVDIR)" -a "$(abspath $(DOCS_VENVDIR))" != "$(DOCS_VENVDIR)" rm -rf $(DOCS_VENVDIR) @@ -259,7 +259,7 @@ clean: clean-integrate clean-doc clean-doc: git clean -fx "$(DOCS_BUILDDIR)" rm -rf $(SPHINX_DIR)/.doctrees - + clean-integrate: rm -rf integration/lxd rm -rf integration/microceph diff --git a/version/version.go b/version/version.go index 72f3c132e..1d56e18af 100644 --- a/version/version.go +++ b/version/version.go @@ -3,10 +3,10 @@ package version // RawVersion is the current daemon version of MicroCloud. // LTS versions also include the patch number. -const RawVersion = "3.3" +const RawVersion = "3.4.0" // LTS should be set if the current version is an LTS (long-term support) version. -const LTS = false +const LTS = true // Version appends "LTS" to the raw version string if MicroCloud is an LTS version. func Version() string {