Skip to content

Commit 6b9e586

Browse files
andreaz98andreaz98
authored
Merge branch 'eclipse-zenoh:master' into master
2 parents 4681f16 + 3e366a5 commit 6b9e586

File tree

244 files changed

+13906
-8727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+13906
-8727
lines changed

‎.clang-format

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
BasedOnStyle: Google
2+
IndentWidth: 4
3+
ColumnLimit: 120
4+
PointerAlignment: Left

‎.cmake-format.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
with section("format"):
2+
line_width = 120
3+
max_subgroups_hwrap = 4
4+
max_pargs_hwrap = 10
5+
6+
with section("markup"):
7+
enable_markup = False

‎.github/release.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#
2+
# Copyright (c) 2023 ZettaScale Technology
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
7+
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
8+
#
9+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
10+
#
11+
# Contributors:
12+
# ZettaScale Zenoh Team, <[email protected]>
13+
#
14+
15+
changelog:
16+
categories:
17+
- title: New features 🎉
18+
labels:
19+
- enhancement
20+
- title: Bug fixes 🐞
21+
labels:
22+
- bug
23+
- title: Other changes
24+
labels:
25+
- "*"

‎.github/workflows/arduino_esp32.yaml

+115-115
Original file line numberDiff line numberDiff line change
@@ -15,129 +15,129 @@ name: arduino_esp32
1515

1616
on:
1717
push:
18-
branches: [ '**' ]
18+
branches: ["**"]
1919
pull_request:
20-
branches: [ '**' ]
20+
branches: ["**"]
2121

2222
jobs:
2323
build:
24-
2524
name: Build on ${{ matrix.os }}
2625
runs-on: ${{ matrix.os }}
2726
strategy:
2827
fail-fast: false
2928
matrix:
30-
os: [ ubuntu-latest ]
29+
os: [ubuntu-latest]
3130

3231
steps:
33-
- uses: actions/checkout@v2
34-
35-
- name: Install requirements
36-
run: |
37-
echo "No requirements need to be installed"
38-
39-
- name: Install PlatformIO
40-
run: |
41-
python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/master/scripts/get-platformio.py)"
42-
. $HOME/.platformio/penv/bin/activate
43-
platformio update
44-
45-
- name: Set up project
46-
run: |
47-
cd $HOME
48-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
49-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
50-
. $HOME/.platformio/penv/bin/activate
51-
52-
mkdir -p $ARDUINO_BASE
53-
cd $ARDUINO_BASE
54-
platformio init -b esp32thing_plus --project-option="build_flags=-DZ_LINK_BLUETOOTH=1"
55-
56-
cd $ARDUINO_BASE/lib
57-
ln -s $ZENOH_PICO_BASE
58-
59-
cd $ARDUINO_BASE
60-
61-
- name: Build z_pub example
62-
run: |
63-
cd $HOME
64-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
65-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
66-
. $HOME/.platformio/penv/bin/activate
67-
68-
rm -rf $ARDUINO_BASE/src/*
69-
cd $ARDUINO_BASE/src
70-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pub.ino
71-
72-
cd $ARDUINO_BASE
73-
platformio run
74-
75-
- name: Build z_sub example
76-
run: |
77-
cd $HOME
78-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
79-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
80-
. $HOME/.platformio/penv/bin/activate
81-
82-
rm -rf $ARDUINO_BASE/src/*
83-
cd $ARDUINO_BASE/src
84-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_sub.ino
85-
86-
cd $ARDUINO_BASE
87-
platformio run
88-
89-
- name: Build z_pull example
90-
run: |
91-
cd $HOME
92-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
93-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
94-
. $HOME/.platformio/penv/bin/activate
95-
96-
rm -rf $ARDUINO_BASE/src/*
97-
cd $ARDUINO_BASE/src
98-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pull.ino
99-
100-
cd $ARDUINO_BASE
101-
platformio run
102-
103-
- name: Build z_get example
104-
run: |
105-
cd $HOME
106-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
107-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
108-
. $HOME/.platformio/penv/bin/activate
109-
110-
rm -rf $ARDUINO_BASE/src/*
111-
cd $ARDUINO_BASE/src
112-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_get.ino
113-
114-
cd $ARDUINO_BASE
115-
platformio run
116-
117-
- name: Build z_queryable example
118-
run: |
119-
cd $HOME
120-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
121-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
122-
. $HOME/.platformio/penv/bin/activate
123-
124-
rm -rf $ARDUINO_BASE/src/*
125-
cd $ARDUINO_BASE/src
126-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_queryable.ino
127-
128-
cd $ARDUINO_BASE
129-
platformio run
130-
131-
- name: Build z_scout example
132-
run: |
133-
cd $HOME
134-
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
135-
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
136-
. $HOME/.platformio/penv/bin/activate
137-
138-
rm -rf $ARDUINO_BASE/src/*
139-
cd $ARDUINO_BASE/src
140-
ln -s $ZENOH_PICO_BASE/examples/arduino/z_scout.ino
141-
142-
cd $ARDUINO_BASE
143-
platformio run
32+
- uses: actions/checkout@v2
33+
34+
- name: Install requirements
35+
run: |
36+
echo "No requirements need to be installed"
37+
38+
- name: Install PlatformIO
39+
run: |
40+
curl -fsSL -o get-platformio.py https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py
41+
python3 get-platformio.py
42+
. $HOME/.platformio/penv/bin/activate
43+
platformio update
44+
45+
- name: Set up project
46+
run: |
47+
cd $HOME
48+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
49+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
50+
. $HOME/.platformio/penv/bin/activate
51+
52+
mkdir -p $ARDUINO_BASE
53+
cd $ARDUINO_BASE
54+
platformio init -b esp32thing_plus --project-option="build_flags=-DZ_LINK_BLUETOOTH=1 -DZENOH_DEBUG=3"
55+
56+
cd $ARDUINO_BASE/lib
57+
ln -s $ZENOH_PICO_BASE
58+
59+
cd $ARDUINO_BASE
60+
61+
- name: Build z_pub example
62+
run: |
63+
cd $HOME
64+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
65+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
66+
. $HOME/.platformio/penv/bin/activate
67+
68+
rm -rf $ARDUINO_BASE/src/*
69+
cd $ARDUINO_BASE/src
70+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pub.ino
71+
72+
cd $ARDUINO_BASE
73+
platformio run
74+
75+
- name: Build z_sub example
76+
run: |
77+
cd $HOME
78+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
79+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
80+
. $HOME/.platformio/penv/bin/activate
81+
82+
rm -rf $ARDUINO_BASE/src/*
83+
cd $ARDUINO_BASE/src
84+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_sub.ino
85+
86+
cd $ARDUINO_BASE
87+
platformio run
88+
89+
- name: Build z_pull example
90+
run: |
91+
cd $HOME
92+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
93+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
94+
. $HOME/.platformio/penv/bin/activate
95+
96+
rm -rf $ARDUINO_BASE/src/*
97+
cd $ARDUINO_BASE/src
98+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_pull.ino
99+
100+
cd $ARDUINO_BASE
101+
platformio run
102+
103+
- name: Build z_get example
104+
run: |
105+
cd $HOME
106+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
107+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
108+
. $HOME/.platformio/penv/bin/activate
109+
110+
rm -rf $ARDUINO_BASE/src/*
111+
cd $ARDUINO_BASE/src
112+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_get.ino
113+
114+
cd $ARDUINO_BASE
115+
platformio run
116+
117+
- name: Build z_queryable example
118+
run: |
119+
cd $HOME
120+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
121+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
122+
. $HOME/.platformio/penv/bin/activate
123+
124+
rm -rf $ARDUINO_BASE/src/*
125+
cd $ARDUINO_BASE/src
126+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_queryable.ino
127+
128+
cd $ARDUINO_BASE
129+
platformio run
130+
131+
- name: Build z_scout example
132+
run: |
133+
cd $HOME
134+
export ARDUINO_BASE=$HOME/work/arduino_esp32project/
135+
export ZENOH_PICO_BASE=$HOME/work/zenoh-pico/zenoh-pico/
136+
. $HOME/.platformio/penv/bin/activate
137+
138+
rm -rf $ARDUINO_BASE/src/*
139+
cd $ARDUINO_BASE/src
140+
ln -s $ZENOH_PICO_BASE/examples/arduino/z_scout.ino
141+
142+
cd $ARDUINO_BASE
143+
platformio run

‎.github/workflows/build.yaml renamed to ‎.github/workflows/build-shared.yaml

+9-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Contributors:
1212
# ZettaScale Zenoh Team, <[email protected]>
1313
#
14-
name: build
14+
name: build-shared
1515

1616
on:
1717
push:
@@ -26,16 +26,19 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [ubuntu-latest, macOS-latest]
29+
os: [ubuntu-latest, macOS-latest, windows-latest]
3030
steps:
3131
- uses: actions/checkout@v2
3232
- name: Compile debug
3333
run: make all
3434
env:
3535
BUILD_TYPE: Debug
36+
BUILD_SHARED_LIBS: ON
3637
BUILD_TESTING: ON
37-
BUILD_MULTICAST: OFF
38-
BUILD_INTEGRATION: OFF
38+
BUILD_MULTICAST: ON
39+
BUILD_INTEGRATION: ON
40+
BUILD_TOOLS: ON
41+
ZENOH_DEBUG: 3
3942

4043
crossbuilds:
4144
name: Build on ubuntu-latest
@@ -46,3 +49,5 @@ jobs:
4649
run: make crossbuilds
4750
env:
4851
BUILD_TYPE: Debug
52+
BUILD_SHARED_LIBS: ON
53+
ZENOH_DEBUG: 3

‎.github/workflows/build-static.yaml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#
2+
# Copyright (c) 2022 ZettaScale Technology
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
7+
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
8+
#
9+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
10+
#
11+
# Contributors:
12+
# ZettaScale Zenoh Team, <[email protected]>
13+
#
14+
name: build-static
15+
16+
on:
17+
push:
18+
branches: [ '**' ]
19+
pull_request:
20+
branches: [ '**' ]
21+
22+
jobs:
23+
build:
24+
name: Build on ${{ matrix.os }}
25+
runs-on: ${{ matrix.os }}
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
os: [ubuntu-latest, macOS-latest, windows-latest]
30+
steps:
31+
- uses: actions/checkout@v2
32+
- name: Compile debug
33+
run: make all
34+
env:
35+
BUILD_TYPE: Debug
36+
BUILD_SHARED_LIBS: OFF
37+
BUILD_TESTING: ON
38+
BUILD_MULTICAST: ON
39+
BUILD_INTEGRATION: ON
40+
BUILD_TOOLS: ON
41+
ZENOH_DEBUG: 3
42+
43+
crossbuilds:
44+
name: Build on ubuntu-latest
45+
runs-on: ubuntu-latest
46+
steps:
47+
- uses: actions/checkout@v2
48+
- name: Crosscompile debug
49+
run: make crossbuilds
50+
env:
51+
BUILD_TYPE: Debug
52+
BUILD_SHARED_LIBS: OFF
53+
ZENOH_DEBUG: 3

‎.github/workflows/emscripten.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Compile debug
3535
run: |
3636
mkdir build
37-
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
37+
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
3838
make -C build
3939
4040

0 commit comments

Comments
 (0)