Skip to content

Commit 412521e

Browse files
author
Stefan Cyliax
authored
Prepare Release of 3.4 (#598)
* maint: Increased version for next release and reworked versioning for doxygen build Signed-off-by: Stefan Cyliax <stefan.cyliax@asam.net>
1 parent fb5da5e commit 412521e

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/protobuf.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,14 @@ jobs:
5454
- name: Prepare C++ Build
5555
run: mkdir build
5656

57-
- name: Prepare Documentation Bukd
57+
# Versioning
58+
- name: Get versioning
59+
id: get_version
60+
run: echo ::set-output name=VERSION::$(git describe --always)
61+
62+
- name: Prepare Documentation Build
5863
run: |
59-
sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in
64+
sed -i 's/PROJECT_NUMBER\s*= @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@/PROJECT_NUMBER = master (${{ steps.get_version.outputs.VERSION }})/g' doxygen_config.cmake.in
6065
echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in
6166
echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in
6267

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "asciidoc-resources"]
2-
path = asciidoc-resources
3-
url = https://code.asam.net/simulation/asciidoc-resources.git
41
[submodule "flatbuffers"]
52
path = flatbuffers
63
url = https://github.com/google/flatbuffers.git

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def main():
3030

3131
sv_ground_truth = sensorview.global_ground_truth
3232
sv_ground_truth.version.version_major = 3
33-
sv_ground_truth.version.version_minor = 3
33+
sv_ground_truth.version.version_minor = 4
3434
sv_ground_truth.version.version_patch = 0
3535

3636
sv_ground_truth.timestamp.seconds = 0

VERSION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
VERSION_MAJOR = 3
2-
VERSION_MINOR = 3
3-
VERSION_PATCH = 1
2+
VERSION_MINOR = 4
3+
VERSION_PATCH = 0

asciidoc-resources

-1
This file was deleted.

0 commit comments

Comments
 (0)