Skip to content

Commit

Permalink
Merge branch 'master' into core/msg-protobuf-server-v6
Browse files Browse the repository at this point in the history
  • Loading branch information
rex-schilasky committed Jan 30, 2025
2 parents 8fcffe1 + 8f23ace commit 3be6eb8
Show file tree
Hide file tree
Showing 274 changed files with 5,559 additions and 3,263 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Checks: "-*,
-modernize-avoid-bind,
performance-*,
-performance-avoid-endl,
readability-*,
-readability-braces-around-statements,
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ jobs:
cd "${{ runner.workspace }}/_build"
cmake $GITHUB_WORKSPACE -G "Ninja" \
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake \
-DHAS_HDF5=ON \
-DHAS_QT5=ON \
-DHAS_CURL=ON \
-DHAS_CAPNPROTO=ON \
-DHAS_FTXUI=ON \
-DBUILD_DOCS=ON \
-DBUILD_APPS=ON \
-DBUILD_SAMPLES=ON \
-DBUILD_TIME=ON \
-DBUILD_PY_BINDING=ON \
-DBUILD_CSHARP_BINDING=OFF \
-DBUILD_ECAL_TESTS=ON \
-DECAL_USE_HDF5=ON \
-DECAL_USE_QT=ON \
-DECAL_USE_CURL=ON \
-DECAL_USE_CAPNPROTO=ON \
-DECAL_USE_FTXUI=ON \
-DECAL_BUILD_DOCS=ON \
-DECAL_BUILD_APPS=ON \
-DECAL_BUILD_SAMPLES=ON \
-DECAL_BUILD_TIMEPLUGINS=ON \
-DECAL_BUILD_PY_BINDING=ON \
-DECAL_BUILD_CSHARP_BINDING=OFF \
-DECAL_BUILD_TESTS=ON \
-DECAL_INSTALL_SAMPLE_SOURCES=ON \
-DECAL_NPCAP_SUPPORT=OFF \
-DECAL_USE_NPCAP=OFF \
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \
-DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON \
Expand Down
27 changes: 13 additions & 14 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,20 @@ jobs:
cmake $GITHUB_WORKSPACE -G "Ninja" \
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DHAS_HDF5=ON \
-DHAS_QT=ON \
-DHAS_CURL=ON \
-DHAS_CAPNPROTO=ON \
-DHAS_FTXUI=ON \
-DBUILD_DOCS=ON \
-DBUILD_APPS=ON \
-DBUILD_SAMPLES=ON \
-DBUILD_TIME=ON \
-DBUILD_PY_BINDING=ON \
-DBUILD_STANDALONE_PY_WHEEL=OFF \
-DBUILD_CSHARP_BINDING=OFF \
-DBUILD_ECAL_TESTS=ON \
-DECAL_USE_HDF5=ON \
-DECAL_USE_QT=ON \
-DECAL_USE_CURL=ON \
-DECAL_USE_CAPNPROTO=ON \
-DECAL_USE_FTXUI=ON \
-DECAL_BUILD_DOCS=ON \
-DECAL_BUILD_APPS=ON \
-DECAL_BUILD_SAMPLES=ON \
-DECAL_BUILD_TIMEPLUGINS=ON \
-DECAL_BUILD_PY_BINDING=ON \
-DECAL_BUILD_CSHARP_BINDING=OFF \
-DECAL_BUILD_TESTS=ON \
-DECAL_INSTALL_SAMPLE_SOURCES=ON \
-DECAL_NPCAP_SUPPORT=OFF \
-DECAL_USE_NPCAP=OFF \
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \
-DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON \
Expand Down
56 changes: 28 additions & 28 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ jobs:
cmake %GITHUB_WORKSPACE% -G "Visual Studio 16 2019" -A x64 -T v142 ^
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake ^
-DHAS_HDF5=ON ^
-DHAS_QT=ON ^
-DHAS_CURL=OFF ^
-DHAS_CAPNPROTO=OFF ^
-DHAS_FTXUI=ON ^
-DBUILD_DOCS=OFF ^
-DBUILD_APPS=OFF ^
-DBUILD_SAMPLES=OFF ^
-DBUILD_TIME=ON ^
-DBUILD_PY_BINDING=OFF ^
-DBUILD_CSHARP_BINDING=OFF ^
-DBUILD_ECAL_TESTS=OFF ^
-DECAL_USE_HDF5=ON ^
-DECAL_USE_QT=ON ^
-DECAL_USE_CURL=OFF ^
-DECAL_USE_CAPNPROTO=OFF ^
-DECAL_USE_FTXUI=ON ^
-DECAL_BUILD_DOCS=OFF ^
-DECAL_BUILD_APPS=OFF ^
-DECAL_BUILD_SAMPLES=OFF ^
-DECAL_BUILD_TIMEPLUGINS=ON ^
-DECAL_BUILD_PY_BINDING=OFF ^
-DECAL_BUILD_CSHARP_BINDING=OFF ^
-DECAL_BUILD_TESTS=OFF ^
-DECAL_INSTALL_SAMPLE_SOURCES=OFF ^
-DECAL_NPCAP_SUPPORT=ON ^
-DECAL_USE_NPCAP=ON ^
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^
-DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON ^
Expand All @@ -92,7 +92,7 @@ jobs:
-DBUILD_SHARED_LIBS=OFF ^
-DCMAKE_PREFIX_PATH="%ProgramFiles%/Cap'n Proto/lib/cmake/CapnProto" ^
-DCMAKE_BUILD_TYPE=Debug ^
-DCPACK_PACK_WITH_INNOSETUP=OFF
-DECAL_CPACK_PACK_WITH_INNOSETUP=OFF
shell: cmd

- name: CMake Complete
Expand All @@ -101,20 +101,20 @@ jobs:
cd "${{ runner.workspace }}/_build/complete"
cmake %GITHUB_WORKSPACE% -G "Visual Studio 16 2019" -A x64 -T v142 ^
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake ^
-DHAS_HDF5=ON ^
-DHAS_QT=ON ^
-DHAS_CURL=ON ^
-DHAS_CAPNPROTO=OFF ^
-DHAS_FTXUI=ON ^
-DBUILD_DOCS=ON ^
-DBUILD_APPS=ON ^
-DBUILD_SAMPLES=ON ^
-DBUILD_TIME=ON ^
-DBUILD_PY_BINDING=OFF ^
-DBUILD_CSHARP_BINDING=ON ^
-DBUILD_ECAL_TESTS=ON ^
-DECAL_USE_HDF5=ON ^
-DECAL_USE_QT=ON ^
-DECAL_USE_CURL=ON ^
-DECAL_USE_CAPNPROTO=OFF ^
-DECAL_USE_FTXUI=ON ^
-DECAL_BUILD_DOCS=ON ^
-DECAL_BUILD_APPS=ON ^
-DECAL_BUILD_SAMPLES=ON ^
-DECAL_BUILD_TIMEPLUGINS=ON ^
-DECAL_BUILD_PY_BINDING=OFF ^
-DECAL_BUILD_CSHARP_BINDING=ON ^
-DECAL_BUILD_TESTS=ON ^
-DECAL_INSTALL_SAMPLE_SOURCES=ON ^
-DECAL_NPCAP_SUPPORT=ON ^
-DECAL_USE_NPCAP=ON ^
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON ^
-DECAL_THIRDPARTY_BUILD_PROTOBUF=ON ^
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON ^
Expand All @@ -130,7 +130,7 @@ jobs:
-DBUILD_SHARED_LIBS=OFF ^
-DCMAKE_PREFIX_PATH="%ProgramFiles%/Cap'n Proto/lib/cmake/CapnProto" ^
-DCMAKE_BUILD_TYPE=Release ^
-DCPACK_PACK_WITH_INNOSETUP=ON
-DECAL_CPACK_PACK_WITH_INNOSETUP=ON
shell: cmd

- name: Build SDK
Expand Down
35 changes: 3 additions & 32 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-latest, ubuntu-24.04-arm]

steps:
- uses: actions/checkout@v4
Expand All @@ -27,40 +27,11 @@ jobs:
fetch-depth: 0

- name: Build wheels
uses: pypa/cibuildwheel@v2.21
uses: pypa/cibuildwheel@v2.22
env:
CIBW_ARCHS: auto64

- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: ./wheelhouse/*.whl

build_arm64_wheels:
# Emulation takes a long time so we save it for release/manual triggering
name: Build arm64 wheels via emulation
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }}

steps:
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0

- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_ARCHS_LINUX: aarch64

- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-arm64
path: ./wheelhouse/*.whl

path: ./wheelhouse/*.whl
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick-to.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
cherry-pick-from-push:
strategy:
matrix:
target-branch: [ "support/v5.12", "support/v5.13" ]
target-branch: [ "support/v5.12", "support/v5.13", "support/v6.0" ]

runs-on: ubuntu-latest

Expand Down
27 changes: 13 additions & 14 deletions .github/workflows/clang-tidy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,20 @@ jobs:
-G Ninja \
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DHAS_HDF5=ON \
-DHAS_QT=ON \
-DHAS_CURL=ON \
-DHAS_CAPNPROTO=OFF \
-DHAS_FTXUI=ON \
-DBUILD_DOCS=OFF \
-DBUILD_APPS=ON \
-DBUILD_SAMPLES=ONS \
-DBUILD_TIME=ON \
-DBUILD_PY_BINDING=OFF \
-DBUILD_STANDALONE_PY_WHEEL=OFF \
-DBUILD_CSHARP_BINDING=OFF \
-DBUILD_ECAL_TESTS=OFF \
-DECAL_USE_HDF5=ON \
-DECAL_USE_QT=ON \
-DECAL_USE_CURL=ON \
-DECAL_USE_CAPNPROTO=OFF \
-DECAL_USE_FTXUI=ON \
-DECAL_BUILD_DOCS=OFF \
-DECAL_BUILD_APPS=ON \
-DECAL_BUILD_SAMPLES=ON \
-DECAL_BUILD_TIMEPLUGINS=ON \
-DECAL_BUILD_PY_BINDING=OFF \
-DECAL_BUILD_CSHARP_BINDING=OFF \
-DECAL_BUILD_TESTS=OFF \
-DECAL_INSTALL_SAMPLE_SOURCES=ON \
-DECAL_NPCAP_SUPPORT=OFF \
-DECAL_USE_NPCAP=OFF \
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \
-DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON \
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/documentation-release-page.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Documentation Release Page

on:
push:

release:
types:
- released
- unpublished
- deleted

jobs:
documentation-release-page:
runs-on: ubuntu-latest

steps:

- name: Get current branch name
id: branch
run: |
# Get the branch name
branch=$(echo ${GITHUB_REF#refs/heads/})
# only publish documentation for master branch
if [[ $branch == master ]]; then
echo "publish_doc=true" >> $GITHUB_ENV
else
echo "publish_doc=false" >> $GITHUB_ENV
fi
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'false'
fetch-depth: 0


- name: Install Python
run: |
sudo apt update
sudo apt-get -y install python3-dev python3-venv
- name: Install Python dependencies
run: |
mkdir ".venv"
python3 -m venv ".venv"
source ".venv/bin/activate"
pip install --upgrade pip
pip install -r "$GITHUB_WORKSPACE/doc/requirements.txt"
- name: Build Release page with Sphinx
env:
ECAL_GH_API_KEY: ${{ secrets.GITHUB_TOKEN }}
run: |
source ".venv/bin/activate"
sphinx-build -b html doc/release_page build/html
- name: Zip Release Page
run: |
cd build/html
zip -r ../release-page.zip .
- name: Upload documentation
uses: actions/upload-artifact@v4
with:
name: release-page
path: build/release-page.zip

- name: Deploy Release Page
uses: peaceiris/actions-gh-pages@v3
with:
publish_branch: gh-pages
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: build/html
destination_dir: releases
if: env.publish_doc == 'true'

26 changes: 13 additions & 13 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,20 @@ jobs:
cd "${{ runner.workspace }}/_build"
cmake $GITHUB_WORKSPACE -G "Ninja" \
-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=cmake/submodule_dependencies.cmake \
-DHAS_HDF5=ON \
-DHAS_QT=OFF \
-DHAS_CURL=OFF \
-DHAS_CAPNPROTO=OFF \
-DHAS_FTXUI=ON \
-DBUILD_DOCS=ON \
-DBUILD_APPS=OFF \
-DBUILD_SAMPLES=OFF \
-DBUILD_TIME=OFF \
-DBUILD_PY_BINDING=ON \
-DBUILD_CSHARP_BINDING=OFF \
-DBUILD_ECAL_TESTS=OFF \
-DECAL_USE_HDF5=ON \
-DECAL_USE_QT=OFF \
-DECAL_USE_CURL=OFF \
-DECAL_USE_CAPNPROTO=OFF \
-DECAL_USE_FTXUI=ON \
-DECAL_BUILD_DOCS=ON \
-DECAL_BUILD_APPS=OFF \
-DECAL_BUILD_SAMPLES=OFF \
-DECAL_BUILD_TIMEPLUGINS=OFF \
-DECAL_BUILD_PY_BINDING=ON \
-DECAL_BUILD_CSHARP_BINDING=OFF \
-DECAL_BUILD_TESTS=OFF \
-DECAL_INSTALL_SAMPLE_SOURCES=OFF \
-DECAL_NPCAP_SUPPORT=OFF \
-DECAL_USE_NPCAP=OFF \
-DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON \
-DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF \
-DECAL_THIRDPARTY_BUILD_SPDLOG=ON \
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ doc/rst/_download_main_page
doc/extensions/_autogen
doc/rst/getting_started/**/*_pb2.py
doc/rst/.venv
doc/release_page/index.rst
doc/release_page/ecal_*.rst
doc/release_page/changelog_*.txt
doc/release_page/_build
.venv/
*.pyc

Expand Down
Loading

0 comments on commit 3be6eb8

Please sign in to comment.