Skip to content

Commit

Permalink
Prepare Release of 3.4 (#598)
Browse files Browse the repository at this point in the history
* maint: Increased version for next release and reworked versioning for doxygen build

Signed-off-by: Stefan Cyliax <[email protected]>
  • Loading branch information
Stefan Cyliax authored Nov 18, 2021
1 parent fb5da5e commit 412521e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/protobuf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,14 @@ jobs:
- name: Prepare C++ Build
run: mkdir build

- name: Prepare Documentation Bukd
# Versioning
- name: Get versioning
id: get_version
run: echo ::set-output name=VERSION::$(git describe --always)

- name: Prepare Documentation Build
run: |
sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in
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
echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in
echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "asciidoc-resources"]
path = asciidoc-resources
url = https://code.asam.net/simulation/asciidoc-resources.git
[submodule "flatbuffers"]
path = flatbuffers
url = https://github.com/google/flatbuffers.git
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def main():

sv_ground_truth = sensorview.global_ground_truth
sv_ground_truth.version.version_major = 3
sv_ground_truth.version.version_minor = 3
sv_ground_truth.version.version_minor = 4
sv_ground_truth.version.version_patch = 0

sv_ground_truth.timestamp.seconds = 0
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION_MAJOR = 3
VERSION_MINOR = 3
VERSION_PATCH = 1
VERSION_MINOR = 4
VERSION_PATCH = 0
1 change: 0 additions & 1 deletion asciidoc-resources
Submodule asciidoc-resources deleted from e0bd50

0 comments on commit 412521e

Please sign in to comment.