From 06d9367863888c5541109f007970277004689c21 Mon Sep 17 00:00:00 2001 From: Habedank Clemens Date: Mon, 15 Mar 2021 13:34:18 +0100 Subject: [PATCH 01/16] removed cones as an example from TYPE_CONSTRUCTION_SITE_ELEMENT because there is a separate TYPE_PYLON --- osi_object.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_object.proto b/osi_object.proto index cb0b80b5d..b44066f0f 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -135,7 +135,7 @@ message StationaryObject TYPE_REFLECTIVE_STRUCTURE = 15; // Landmarks corresponding to construction site elements in the - // environment, like cones or beacons. + // environment, like beacons. // TYPE_CONSTRUCTION_SITE_ELEMENT = 16; } From 6db66ba0504afa68389b3d9eb1d363a05c4b4ff7 Mon Sep 17 00:00:00 2001 From: Viktor Kreschenski Date: Wed, 17 Feb 2021 11:24:28 +0100 Subject: [PATCH 02/16] Added release notes for 3.3.0 Signed-off-by: Viktor Kreschenski Signed-off-by: Habedank Clemens --- doc/releases/v03.03.rst | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 doc/releases/v03.03.rst diff --git a/doc/releases/v03.03.rst b/doc/releases/v03.03.rst new file mode 100644 index 000000000..c09f2f34b --- /dev/null +++ b/doc/releases/v03.03.rst @@ -0,0 +1,34 @@ +`v3.3.0 - OSI "Fabulous Fangio" `_ +============================== + +Stay p(OSI)tive! + +Purpose: +--------- +As a part of the increasing adoption of OSI in the industry, and its movement to ASAM as its home, +several new use cases and extensions for OSI have been identified. +This minor release highlights the work that has been done on several working packages including +the introduction of brand new top level messages which extend OSI's scope beyond the specialized world of sensor modeling. + +`Content/Changes `_: +--------------------------------------------------------------------------------------------------------------------------------------------- + +- Introduced the TrafficCommand top-level message which enables event-based control of traffic participant models, e.g. with regard to a scenario specification. +- Introduced the TrafficUpdate top-level message to send updated properties of traffic participant models. +- Add new LogicalDetectionData message to SensorData, which provides detection data with respect to the reference frame of the logical/virtual sensor. +- Added a new submessage to further specify wheel data. +- Added a new field to support future trajectories of moving objects. +- Added a new subtype message to osi_lane to better align with OpenDrive's lane type information and enable traffic participant models to identify lanes on which they are supposed to move. +- Extended traffic lights and signs messages to include the model_references attribute that can be used to point out to a 3D-model. +- Add global model reference to ground truth that can be used to specify the 3D model representing the environment. +- Extended the camera sensor view configuration to better support the configuration of the simulation environment. +- Added a new field to describe the position of the steering wheel. +- Added a message MovingObjectClassification for classify-able attributes that are shared between different moving object types. Introduced the assigned lane id and the assigned lane percentage of a moving object there. + +- Updated to checklist for pull requests to provide clearer orientation for all users. +- Updated the documentation of centerline and lane boundaries (ordering of the points, describing those lines). +- Updated the documentation of 3D bounding boxes. +- Update the documentation of ground clearance. + +- Make handling of enums in rules check more robust, especially ones. +- Set the default compiler to C++ 11 to support protobuf>3.6. \ No newline at end of file From 6b44b2e89be54cc7a7255cdd1d3cd8f61bfce473 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Thu, 18 Mar 2021 10:20:54 +0100 Subject: [PATCH 03/16] Add 3.3.0 release notes to TOC document Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- doc/releases.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/releases.rst b/doc/releases.rst index a5b708829..092524a9f 100644 --- a/doc/releases.rst +++ b/doc/releases.rst @@ -11,3 +11,4 @@ Releases releases/v03.00 releases/v03.01 releases/v03.02 + releases/v03.03 From 373b8afd53b9e7145330d4f472823787fd5bf97e Mon Sep 17 00:00:00 2001 From: hschoen Date: Mon, 8 Mar 2021 10:52:03 +0100 Subject: [PATCH 04/16] Correct typos in model_reference comments Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- osi_groundtruth.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osi_groundtruth.proto b/osi_groundtruth.proto index d862ff988..10f9dceae 100644 --- a/osi_groundtruth.proto +++ b/osi_groundtruth.proto @@ -167,8 +167,8 @@ message GroundTruth // // \note It is implementation-specific how model_references are resolved to // 3d models. The parts the world model contains are also implementation-specific. - // For example, the world model can wether contain street geometries or - // derives street geometies automatically from a map reference. + // For example, the world model can either contain street geometries or + // derives street geometries automatically from a map reference. // optional string model_reference = 16; } From cb4ba05f8850c0f4171dc06d9458bcffa192acea Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 23 Apr 2021 14:50:11 +0200 Subject: [PATCH 05/16] Fix old version info in release 3.3.0 Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a56e6c0b7..909aa38e2 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR = 3 -VERSION_MINOR = 2 -VERSION_PATCH = 0 +VERSION_MINOR = 3 +VERSION_PATCH = 1 From cc9e7346fd2b9887e71c28bf565bf5f2eeac7ce6 Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Mon, 26 Apr 2021 07:53:04 +0200 Subject: [PATCH 06/16] updated release notes for bugfix Signed-off-by: Stefan Cyliax Signed-off-by: Habedank Clemens --- doc/releases/v03.03.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/releases/v03.03.rst b/doc/releases/v03.03.rst index c09f2f34b..f04319542 100644 --- a/doc/releases/v03.03.rst +++ b/doc/releases/v03.03.rst @@ -31,4 +31,11 @@ the introduction of brand new top level messages which extend OSI's scope beyond - Update the documentation of ground clearance. - Make handling of enums in rules check more robust, especially ones. -- Set the default compiler to C++ 11 to support protobuf>3.6. \ No newline at end of file +- Set the default compiler to C++ 11 to support protobuf>3.6. + +`v3.3.1 - OSI "Fabulous Fangio", Update 1 `_ +========================================== + +`Content/Changes `_: +--------------------------------------------------------------------------------------------------------------------------------------------- +- **Bug Fix**: Versioning in VERSION file wrong in 3.3.0. This lead to wrong versioning in Doxygen documentation. From 13224ce0cd6e43d28d6f8f95894131226ba240e5 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Wed, 28 Apr 2021 12:38:19 +0200 Subject: [PATCH 07/16] Remove obsolete image and update release notes Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- README.md | 3 --- doc/releases/v03.03.rst | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 038925c61..4e032250e 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,6 @@ The Open Simulation Interface [[1]](https://www.hot.ei.tum.de/forschung/aut As the complexity of automated driving functions rapidly increases, the requirements for test and development methods are growing. Testing in virtual environments offers the advantage of completely controlled and reproducible environment conditions. -In this context, OSI defines generic interfaces to ensure modularity, integrability, and interchangeability of the individual components: -![](doc/images/osicontextwiki.png) - For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. [1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ diff --git a/doc/releases/v03.03.rst b/doc/releases/v03.03.rst index f04319542..77c96f95f 100644 --- a/doc/releases/v03.03.rst +++ b/doc/releases/v03.03.rst @@ -38,4 +38,5 @@ the introduction of brand new top level messages which extend OSI's scope beyond `Content/Changes `_: --------------------------------------------------------------------------------------------------------------------------------------------- -- **Bug Fix**: Versioning in VERSION file wrong in 3.3.0. This lead to wrong versioning in Doxygen documentation. +- **Bug Fix**: Fixed outdated version information in VERSION file in 3.3.0. This lead to wrong versioning in proto definitions and Doxygen documentation. +- **Bug Fix**: Removed outdated picture in README.md. From fbbcc9ee24fd7a3687b7ec54dab1f5183e831d75 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Thu, 14 Jan 2021 13:06:28 +0100 Subject: [PATCH 08/16] Initial GitHub Actions CPP ProtoBuf Build Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 49 ++++++++++ .travis.yml | 161 --------------------------------- 2 files changed, 49 insertions(+), 161 deletions(-) create mode 100644 .github/workflows/protobuf.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml new file mode 100644 index 000000000..009c8e5dd --- /dev/null +++ b/.github/workflows/protobuf.yml @@ -0,0 +1,49 @@ +name: ProtoBuf CI Builds + +on: + push: + pull_request: + branches: [ master ] + +jobs: + build-cpp-linux64: + name: Build C++ Linux 64 + + runs-on: ubuntu-18.04 + + steps: + - name: Checkout OSI + uses: actions/checkout@v2 + with: + submodules: true + + - name: Cache Dependencies + id: cache-depends + uses: actions/cache@v2 + with: + path: protobuf-3.11.3 + key: ${{ runner.os }}-v1-depends + + - name: Download ProtoBuf + if: steps.cache-depends.outputs.cache-hit != 'true' + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.3/protobuf-all-3.11.3.tar.gz && tar xzvf protobuf-all-3.11.3.tar.gz + + - name: Build ProtoBuf + if: steps.cache-depends.outputs.cache-hit != 'true' + working-directory: protobuf-3.11.3 + run: ./configure DIST_LANG=cpp --prefix=/usr && make + + - name: Install ProtoBuf + working-directory: protobuf-3.11.3 + run: sudo make install && sudo ldconfig + + - name: Prepare Build + run: mkdir build + + - name: Configure Build + working-directory: build + run: cmake .. + + - name: Build + working-directory: build + run: cmake --build . --config Release -j 4 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d7c1215ce..000000000 --- a/.travis.yml +++ /dev/null @@ -1,161 +0,0 @@ -# Source: https://github.com/boostorg/hana/blob/master/.travis.yml - -# Use distribution Ubuntu 18.04 Bionic -dist: bionic - -# Use C++ build environment. -language: cpp - -# Protobuf requires g++ (see https://github.com/google/protobuf/blob/master/src/README.md) -compiler: - - gcc - -# Cache dependencies to speed up the build. -cache: - directories: - - ${HOME}/deps/cmake - - ${HOME}/deps/protobuf -# - ${HOME}/deps/proto2cpp - -# Handle dependencies in separate directory. -before_install: - - TESTINST_DIR="${HOME}/dummy" - - mkdir -p "${TESTINST_DIR}" - - DEPS_DIR="${HOME}/deps" - - mkdir -p "${DEPS_DIR}" - - cd "${DEPS_DIR}" - -# Install necessary packages. -install: - # Install a recent version of CMake - - | - CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" - if [ ! -f ${DEPS_DIR}/cmake/bin/cmake ] ; then mkdir -p cmake ; travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake ; fi - export PATH=${DEPS_DIR}/cmake/bin:${PATH} - - # Install a recent version of the Protobuf - - | - PROTOBUF_URL="https://github.com/google/protobuf/releases/download/v3.2.0/protobuf-cpp-3.2.0.tar.gz" - if [ ! -f ${DEPS_DIR}/protobuf/install/bin/protoc ] ; then mkdir -p protobuf ; travis_retry wget --no-check-certificate --quiet -O - ${PROTOBUF_URL} | tar --strip-components=1 -xz -C protobuf ; cd protobuf ; ./configure --prefix=${DEPS_DIR}/protobuf/install ; make ; make install ; fi - export PATH=${DEPS_DIR}/protobuf/install/bin:${PATH} - - # Install proto2cpp for doxygen - - | - PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" - if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi - -# Environment variables. -env: - global: - - GH_REPO_ORG=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 1` - - GH_REPO_NAME=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 2` - - GH_REPO_REF="github.com/$GH_REPO_ORG/$GH_REPO_NAME.git" - -# Addons necessary for documentation. -addons: - apt: - packages: - - doxygen - - doxygen-doc - - doxygen-latex - - doxygen-gui - - graphviz - - python3-setuptools - - python3-pip - - python3-wheel - - -jobs: - include: - # Run the build script and generate documentation. - - stage: test OSI protobuf - - name: 'Test protobuf 2.6.1 syntax' - script: - - cd "${TRAVIS_BUILD_DIR}" - - mkdir -p build - - cd build - - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} .. - - cmake --build . - - cd .. - - python3 setup.py build - - python3 setup.py sdist - - python3 -m pip install -U pip - - python3 -m pip install . - - cd build - - cmake --build . --target install - - cd .. - - cp VERSION VERSION.SAVED - - echo "" >> VERSION - - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - - cd build - - cmake -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - - echo "EXCLUDE_PATTERNS = */osi3/*" >> Doxyfile - - echo "GENERATE_TREEVIEW = YES" >> Doxyfile - - doxygen - - cd .. - - python3 -m unittest discover tests - - - script: - - cd "${TRAVIS_BUILD_DIR}" - - bash convert-to-proto3.sh - - rm *.pb2 - - mkdir -p build - - cd build - - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} .. - - cmake --build . - - cd .. - - python3 setup.py build - - python3 setup.py sdist - - python3 -m pip install -U pip - - python3 -m pip install . - - cd build - - cmake --build . --target install - - cd .. - - cp VERSION VERSION.SAVED - - echo "" >> VERSION - - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - - cd build - - cmake -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - - echo "EXCLUDE_PATTERNS = */osi3/*" >> Doxyfile - - echo "GENERATE_TREEVIEW = YES" >> Doxyfile - - doxygen - - cd .. - - python3 -m unittest discover tests - name: 'Test protobuf 3.0.0 syntax' - - - stage: deploy - script: - - cd "${TRAVIS_BUILD_DIR}" - - mkdir -p build - - cd build - - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} .. - - cmake --build . - - cd .. - - python3 setup.py build - - python3 setup.py sdist - - python3 -m pip install -U pip - - python3 -m pip install . - - cd build - - cmake --build . --target install - - cd .. - - cp VERSION VERSION.SAVED - - echo "" >> VERSION - - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - - cd build - - cmake -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - - echo "EXCLUDE_PATTERNS = */osi3/*" >> Doxyfile - - echo "GENERATE_TREEVIEW = YES" >> Doxyfile - - doxygen - - cd .. - - python3 -m unittest discover tests - - # Deploy the documentation on github (only for master branch). - deploy: - provider: pages - skip_cleanup: true - local_dir: doc/html - keep-history: true - github_token: ${GH_REPO_TOKEN} - on: - branch: master From 69f1c9154d32aae7025edec87116348fa74a3aa8 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Thu, 14 Jan 2021 17:57:15 +0100 Subject: [PATCH 09/16] Add Python ProtoBuf build Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 009c8e5dd..09c348b4e 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -6,8 +6,8 @@ on: branches: [ master ] jobs: - build-cpp-linux64: - name: Build C++ Linux 64 + build-proto2-linux64: + name: Build Proto2 Linux 64 runs-on: ubuntu-18.04 @@ -17,6 +17,14 @@ jobs: with: submodules: true + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: '3.7' + + - name: Install Python Dependencies + run: python -m pip install --upgrade pip setuptools wheel pyyaml + - name: Cache Dependencies id: cache-depends uses: actions/cache@v2 @@ -37,13 +45,23 @@ jobs: working-directory: protobuf-3.11.3 run: sudo make install && sudo ldconfig - - name: Prepare Build + - name: Prepare C++ Build run: mkdir build - - name: Configure Build + - name: Configure C++ Build working-directory: build run: cmake .. - - name: Build + - name: Build C++ working-directory: build run: cmake --build . --config Release -j 4 + + - name: Build Python + run: python setup.py build && python setup.py sdist + + - name: Install Python + run: python -m pip install . + + - name: Run Python Tests + run: python -m unittest discover tests + From eb1e008e1c50ff13c1303e00e7226e4421616051 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Thu, 14 Jan 2021 23:45:06 +0100 Subject: [PATCH 10/16] Add documentation generation Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 09c348b4e..900e30282 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -25,6 +25,9 @@ jobs: - name: Install Python Dependencies run: python -m pip install --upgrade pip setuptools wheel pyyaml + - name: Install Doxygen + run: sudo apt-get install doxygen graphviz + - name: Cache Dependencies id: cache-depends uses: actions/cache@v2 @@ -45,12 +48,20 @@ jobs: working-directory: protobuf-3.11.3 run: sudo make install && sudo ldconfig + - name: Install proto2cpp + run: git clone --depth 1 https://github.com/OpenSimulationInterface/proto2cpp.git + - name: Prepare C++ Build run: mkdir build + - name: Prepare Documentation Bukd + run: | + echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.11.3/* */proto2cpp/*" >> doxygen_config.cmake.in + echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in + - name: Configure C++ Build working-directory: build - run: cmake .. + run: cmake -D FILTER_PROTO2CPP_PY_PATH=$GITHUB_WORKSPACE/proto2cpp .. - name: Build C++ working-directory: build @@ -65,3 +76,10 @@ jobs: - name: Run Python Tests run: python -m unittest discover tests + - name: Archive Documentation + uses: actions/upload-artifact@v2 + with: + name: linux64-doc + path: doc/html + if-no-files-found: error + From 2a3c8de22134691b58bca4892229fcdec65b1414 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 15 Jan 2021 01:24:01 +0100 Subject: [PATCH 11/16] Add Proto3 Test Builds Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 900e30282..667893416 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -83,3 +83,66 @@ jobs: path: doc/html if-no-files-found: error + build-proto3-linux64: + name: Build Proto3 Linux 64 + + runs-on: ubuntu-18.04 + + steps: + - name: Checkout OSI + uses: actions/checkout@v2 + with: + submodules: true + + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: '3.7' + + - name: Install Python Dependencies + run: python -m pip install --upgrade pip setuptools wheel pyyaml + + - name: Cache Dependencies + id: cache-depends + uses: actions/cache@v2 + with: + path: protobuf-3.11.3 + key: ${{ runner.os }}-v1-depends + + - name: Download ProtoBuf + if: steps.cache-depends.outputs.cache-hit != 'true' + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.3/protobuf-all-3.11.3.tar.gz && tar xzvf protobuf-all-3.11.3.tar.gz + + - name: Build ProtoBuf + if: steps.cache-depends.outputs.cache-hit != 'true' + working-directory: protobuf-3.11.3 + run: ./configure DIST_LANG=cpp --prefix=/usr && make + + - name: Install ProtoBuf + working-directory: protobuf-3.11.3 + run: sudo make install && sudo ldconfig + + - name: Prepare C++ Build + run: mkdir build + + - name: Switch to Proto3 Syntax + run: | + bash convert-to-proto3.sh + rm *.pb2 + + - name: Configure C++ Build + working-directory: build + run: cmake .. + + - name: Build C++ + working-directory: build + run: cmake --build . --config Release -j 4 + + - name: Build Python + run: python setup.py build && python setup.py sdist + + - name: Install Python + run: python -m pip install . + + - name: Run Python Tests + run: python -m unittest discover tests From 222b2085aaabbd8122d417511221f9a4b1c20d09 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 15 Jan 2021 01:24:13 +0100 Subject: [PATCH 12/16] Adjust version number for Doxygen documentation Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 667893416..e00487d16 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -56,6 +56,7 @@ jobs: - name: Prepare Documentation Bukd run: | + sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.11.3/* */proto2cpp/*" >> doxygen_config.cmake.in echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in From 66ff0722ea5db144a376f2fe127bb8423141169f Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 15 Jan 2021 01:58:38 +0100 Subject: [PATCH 13/16] Update Build status badge to GitHub Actions CI Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e032250e..bf47eed8c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Open Simulation Interface (OSI) =============================== -[![Travis Build Status](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface.svg?branch=master)](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface) +[![GitHub Build Status](https://github.com/pmai/open-simulation-interface/workflows/ProtoBuf%20CI%20Builds/badge.svg)](https://github.com/pmai/open-simulation-interface/actions?query=workflow%3A%22ProtoBuf+CI+Builds%22) The Open Simulation Interface [[1]](https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/) (OSI) is a generic interface based on [Google's protocol buffers](https://developers.google.com/protocol-buffers/) for the environmental perception of automated driving functions in virtual scenarios. From c674c972e283854f2e2ce66b8912f1386e841bcc Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Mon, 26 Apr 2021 08:24:49 +0200 Subject: [PATCH 14/16] added deploy to gh-pages and update to current protobuf version Signed-off-by: Stefan Cyliax Signed-off-by: Habedank Clemens --- .github/workflows/protobuf.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index e00487d16..11b52d5ff 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -32,20 +32,20 @@ jobs: id: cache-depends uses: actions/cache@v2 with: - path: protobuf-3.11.3 + path: protobuf-3.15.8 key: ${{ runner.os }}-v1-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.3/protobuf-all-3.11.3.tar.gz && tar xzvf protobuf-all-3.11.3.tar.gz + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz - name: Build ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - working-directory: protobuf-3.11.3 + working-directory: protobuf-3.15.8 run: ./configure DIST_LANG=cpp --prefix=/usr && make - name: Install ProtoBuf - working-directory: protobuf-3.11.3 + working-directory: protobuf-3.15.8 run: sudo make install && sudo ldconfig - name: Install proto2cpp @@ -57,7 +57,7 @@ jobs: - name: Prepare Documentation Bukd run: | sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in - echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.11.3/* */proto2cpp/*" >> 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 - name: Configure C++ Build @@ -78,12 +78,20 @@ jobs: run: python -m unittest discover tests - name: Archive Documentation + if: ${{ github.event_name == 'pull_request' }} uses: actions/upload-artifact@v2 with: name: linux64-doc path: doc/html if-no-files-found: error + - name: deploy to gh-pages if push to master branch + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./doc/html + build-proto3-linux64: name: Build Proto3 Linux 64 @@ -107,20 +115,20 @@ jobs: id: cache-depends uses: actions/cache@v2 with: - path: protobuf-3.11.3 + path: protobuf-3.15.8 key: ${{ runner.os }}-v1-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.3/protobuf-all-3.11.3.tar.gz && tar xzvf protobuf-all-3.11.3.tar.gz + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz - name: Build ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - working-directory: protobuf-3.11.3 + working-directory: protobuf-3.15.8 run: ./configure DIST_LANG=cpp --prefix=/usr && make - name: Install ProtoBuf - working-directory: protobuf-3.11.3 + working-directory: protobuf-3.15.8 run: sudo make install && sudo ldconfig - name: Prepare C++ Build From ba1a165db5c61817332682674a998fdd6b322f6d Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Mon, 26 Apr 2021 09:42:25 +0200 Subject: [PATCH 15/16] preparation of badge address to target repo Signed-off-by: Stefan Cyliax Signed-off-by: Habedank Clemens --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf47eed8c..6053ce638 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Open Simulation Interface (OSI) =============================== -[![GitHub Build Status](https://github.com/pmai/open-simulation-interface/workflows/ProtoBuf%20CI%20Builds/badge.svg)](https://github.com/pmai/open-simulation-interface/actions?query=workflow%3A%22ProtoBuf+CI+Builds%22) +[![ProtoBuf CI Builds](https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml/badge.svg)](https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml) The Open Simulation Interface [[1]](https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/) (OSI) is a generic interface based on [Google's protocol buffers](https://developers.google.com/protocol-buffers/) for the environmental perception of automated driving functions in virtual scenarios. From 7a105075780e3ed9d715bd0906beeda3d299914a Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 15 Apr 2021 16:02:00 +0200 Subject: [PATCH 16/16] Add color orange as suggested in issue #504 - Harmonization of road mark colors with OpenDRIVE Signed-off-by: Pierre R. Mai Signed-off-by: Habedank Clemens --- osi_lane.proto | 4 ++++ osi_roadmarking.proto | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/osi_lane.proto b/osi_lane.proto index b9b1cce10..3fed17271 100644 --- a/osi_lane.proto +++ b/osi_lane.proto @@ -993,6 +993,10 @@ message LaneBoundary // Marking with violet color. // COLOR_VIOLET = 8; + + // Marking with orange color. + // + COLOR_ORANGE = 9; } } } diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index fd8cd0378..7afbf4f77 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -121,8 +121,8 @@ message RoadMarking // Boolean flag to indicate that the road marking is taken out of service. - // This can be achieved by visibly crossing the road marking with stripes, - // or completly covering a road marking making it not visible. + // This can be achieved by visibly crossing the road marking with stripes, + // or completly covering a road marking making it not visible. // // \image html OSI_RoadMaking_is_out_of_service.jpg width=800px // @@ -206,6 +206,10 @@ message RoadMarking // Marking with violet color. // COLOR_VIOLET = 8; + + // Marking with orange color. + // + COLOR_ORANGE = 9; } } }