This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new a18ae03 latest to next
a18ae03 is described below
commit a18ae03e3bd16c32da81278a2a4639ce3d1ae95c
Author: David Jencks <[email protected]>
AuthorDate: Sun Oct 24 13:18:53 2021 -0700
latest to next
---
docs/antora.yml | 28 +++++++++++++++++++++++++++-
release.adoc | 29 +++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index cf5e881..a320fbd 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,7 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Another part of this distributed component is in camel-k-runtime docs
+
name: camel-k
title: Camel K
-version: latest
+version: next
+prerelease: true
+display-version: Next (Pre-release)
nav:
- modules/ROOT/nav.adoc
- modules/languages/nav-languages.adoc
- modules/ROOT/nav-end.adoc
+
+# On release, update this to the appropriate released camel version.
+asciidoc:
+ attributes:
+ camel-version: next
diff --git a/release.adoc b/release.adoc
index 1b7e1fa..6042d3f 100644
--- a/release.adoc
+++ b/release.adoc
@@ -161,6 +161,35 @@ export BRANCH=main
A `release-notes.md` file is generated and can be attached to the release
github issue for reference.
+[[documentation]]
+== Documentation updates
+
+In order that the newly released versions of camel-k and camel-k-runtime
appear in the Camel website, follow these steps:
+
+. In camel-k `docs/antora.yml`:
+.. Set the `version` appropriately, e.g. `1.7.x`
+.. Remove the `prerelease` and `display_version`.
+.. Set the `asciidoc.attributes.camel-version` to the appropriate released
camel docs version, e.g. `3.12.x`.
+. In the camel-k-runtime corresponding to the camel-k release
`docs/antora.yml` set the `version` to the same value as in step 1.a.
+. After the vote has passed, update the camel-website `antora-playbook.yml`
+`content.sources` section for camel-k and camel-k-runtime to use the newly
released versions, replacing the previous released version.
+
+NOTE: this needs work, 1.6.x doesn't appear to have a corresponding
camel-k-runtime
+[source,yaml]
+----
+ - url: https://github.com/apache/camel-k.git
+ branches:
+ - main
+# Release-1.6.x does not work because there is no corresponding
camel-k-runtime version for languages.
+# - release-1.6.x
+ - release-1.4.x
+ start_path: docs
+
+ - url: https://github.com/apache/camel-k-runtime.git
+ branches:
+ - main
+ start_path: docs
+----
[[voting]]
== Voting