Skip to content

Commit

Permalink
Merge branch 'eclipse-zenoh:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaz98 authored Sep 14, 2023
2 parents 4681f16 + 3e366a5 commit 6b9e586
Show file tree
Hide file tree
Showing 244 changed files with 13,906 additions and 8,727 deletions.
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
BasedOnStyle: Google
IndentWidth: 4
ColumnLimit: 120
PointerAlignment: Left
7 changes: 7 additions & 0 deletions .cmake-format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
with section("format"):
line_width = 120
max_subgroups_hwrap = 4
max_pargs_hwrap = 10

with section("markup"):
enable_markup = False
25 changes: 25 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Copyright (c) 2023 ZettaScale Technology
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
#
# Contributors:
# ZettaScale Zenoh Team, <[email protected]>
#

changelog:
categories:
- title: New features 🎉
labels:
- enhancement
- title: Bug fixes 🐞
labels:
- bug
- title: Other changes
labels:
- "*"
230 changes: 115 additions & 115 deletions .github/workflows/arduino_esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,129 +15,129 @@ name: arduino_esp32

on:
push:
branches: [ '**' ]
branches: ["**"]
pull_request:
branches: [ '**' ]
branches: ["**"]

jobs:
build:

name: Build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2

- name: Install requirements
run: |
echo "No requirements need to be installed"
- name: Install PlatformIO
run: |
python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/master/scripts/get-platformio.py)"
. $HOME/.platformio/penv/bin/activate
platformio update
- name: Set up project
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
mkdir -p $ARDUINO_BASE
cd $ARDUINO_BASE
platformio init -b esp32thing_plus --project-option="build_flags=-DZ_LINK_BLUETOOTH=1"
cd $ARDUINO_BASE/lib
ln -s $ZENOH_PICO_BASE
cd $ARDUINO_BASE
- name: Build z_pub example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pub.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_sub example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_sub.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_pull example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pull.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_get example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_get.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_queryable example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_queryable.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_scout example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_scout.ino
cd $ARDUINO_BASE
platformio run
- uses: actions/checkout@v2

- name: Install requirements
run: |
echo "No requirements need to be installed"
- name: Install PlatformIO
run: |
curl -fsSL -o get-platformio.py https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py
python3 get-platformio.py
. $HOME/.platformio/penv/bin/activate
platformio update
- name: Set up project
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
mkdir -p $ARDUINO_BASE
cd $ARDUINO_BASE
platformio init -b esp32thing_plus --project-option="build_flags=-DZ_LINK_BLUETOOTH=1 -DZENOH_DEBUG=3"
cd $ARDUINO_BASE/lib
ln -s $ZENOH_PICO_BASE
cd $ARDUINO_BASE
- name: Build z_pub example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pub.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_sub example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_sub.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_pull example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pull.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_get example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_get.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_queryable example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_queryable.ino
cd $ARDUINO_BASE
platformio run
- name: Build z_scout example
run: |
cd $HOME
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
. $HOME/.platformio/penv/bin/activate
rm -rf $ARDUINO_BASE/src/*
cd $ARDUINO_BASE/src
ln -s $ZENOH_PICO_BASE/examples/arduino/z_scout.ino
cd $ARDUINO_BASE
platformio run
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Contributors:
# ZettaScale Zenoh Team, <[email protected]>
#
name: build
name: build-shared

on:
push:
Expand All @@ -26,16 +26,19 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- name: Compile debug
run: make all
env:
BUILD_TYPE: Debug
BUILD_SHARED_LIBS: ON
BUILD_TESTING: ON
BUILD_MULTICAST: OFF
BUILD_INTEGRATION: OFF
BUILD_MULTICAST: ON
BUILD_INTEGRATION: ON
BUILD_TOOLS: ON
ZENOH_DEBUG: 3

crossbuilds:
name: Build on ubuntu-latest
Expand All @@ -46,3 +49,5 @@ jobs:
run: make crossbuilds
env:
BUILD_TYPE: Debug
BUILD_SHARED_LIBS: ON
ZENOH_DEBUG: 3
53 changes: 53 additions & 0 deletions .github/workflows/build-static.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#
# Copyright (c) 2022 ZettaScale Technology
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
#
# Contributors:
# ZettaScale Zenoh Team, <[email protected]>
#
name: build-static

on:
push:
branches: [ '**' ]
pull_request:
branches: [ '**' ]

jobs:
build:
name: Build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- name: Compile debug
run: make all
env:
BUILD_TYPE: Debug
BUILD_SHARED_LIBS: OFF
BUILD_TESTING: ON
BUILD_MULTICAST: ON
BUILD_INTEGRATION: ON
BUILD_TOOLS: ON
ZENOH_DEBUG: 3

crossbuilds:
name: Build on ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Crosscompile debug
run: make crossbuilds
env:
BUILD_TYPE: Debug
BUILD_SHARED_LIBS: OFF
ZENOH_DEBUG: 3
2 changes: 1 addition & 1 deletion .github/workflows/emscripten.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Compile debug
run: |
mkdir build
emcmake cmake -E env CFLAGS="-DZ_LINK_WS=1 -DZ_LINK_TCP=0 -DZ_LINK_UDP_MULTICAST=0 -DZ_LINK_UDP_UNICAST=0 -DZ_SCOUTING_UDP=0" cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_STANDARD=11 -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF -DBUILD_MULTICAST=OFF -DBUILD_INTEGRATION=OFF -DBUILD_TOOLS=OFF -H. -Bbuild
emcmake cmake -E env CFLAGS="-DZ_LINK_WS=1 -DZ_LINK_TCP=0 -DZ_LINK_UDP_MULTICAST=0 -DZ_LINK_UDP_UNICAST=0 -DZ_SCOUTING_UDP=0" cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_STANDARD=11 -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF -DBUILD_MULTICAST=OFF -DBUILD_INTEGRATION=OFF -DBUILD_TOOLS=OFF -DZENOH_DEBUG=3 -H. -Bbuild
make -C build
Loading

0 comments on commit 6b9e586

Please sign in to comment.