Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into protocol_changes #872

Merged
merged 21 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f36b228
Rebase Tokio Porting (#830)
YuanYuYuan Mar 14, 2024
c401e3a
fix(workflows/release): Rectify merge conflict resolution error (#833)
fuzzypixelz Mar 14, 2024
65f06fd
fix: Release workflow failure on scheduled runs (#836)
fuzzypixelz Mar 15, 2024
0bdd136
Expand TCP / UDP binding interface to android. (#832)
DariusIMP Mar 18, 2024
27ee162
fix unixpipe locator #841 (#845)
yellowhatter Mar 19, 2024
03ed5d9
Fix issue #835 (#844)
YuanYuYuan Mar 19, 2024
7fc04e7
Add connection retry (#770)
sashacmc Mar 19, 2024
0a3b7a9
Implement vsock link support (#811)
sashacmc Mar 19, 2024
a681c1e
Turn the socket interface binding to be optional (#850)
YuanYuYuan Mar 20, 2024
7047e58
Bump mio from 0.8.8 to 0.8.11 (#789)
dependabot[bot] Mar 20, 2024
5f60372
Remind the users start z_pong first in the ping pong example (#852)
YuanYuYuan Mar 20, 2024
1d1df0e
Add configurable wait_before_drop time in case of CongestionControl::…
JEnoch Mar 20, 2024
3a26455
Clarify keep_alive configuration parameter (#856)
Mallets Mar 22, 2024
402010e
Enable queries timeout (#853)
sashacmc Mar 25, 2024
ccc3ca6
Update ZenohId representation (#860)
Mallets Mar 25, 2024
d29636f
Explicitly specify the default features in the examples. (#854)
YuanYuYuan Mar 25, 2024
e04c861
Specify runtime for queries timeout spawn (#861)
sashacmc Mar 25, 2024
d4c77c0
Merge main
Mallets Mar 28, 2024
6c6050b
Fix cargo clippy
Mallets Mar 28, 2024
1a2ba1a
Fix code format
Mallets Mar 28, 2024
7162ff1
Fix cargo clippy
Mallets Mar 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,17 @@ jobs:

- name: Run tests
run: cargo nextest run --exclude zenoh-examples --exclude zenoh-plugin-example --workspace
env:
ASYNC_STD_THREAD_COUNT: 4

- name: Run tests with SHM
if: ${{ matrix.os == 'ubuntu-latest' }}
run: cargo nextest run -F shared-memory -F transport_unixpipe -p zenoh-transport
env:
ASYNC_STD_THREAD_COUNT: 4

- name: Check for feature leaks
if: ${{ matrix.os == 'ubuntu-latest' }}
run: cargo nextest run -p zenohd --no-default-features

- name: Run doctests
run: cargo test --doc
env:
ASYNC_STD_THREAD_COUNT: 4

# NOTE: In GitHub repository settings, the "Require status checks to pass
# before merging" branch protection rule ensures that commits are only merged
Expand Down
88 changes: 0 additions & 88 deletions .github/workflows/publish-docker.yml

This file was deleted.

18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ on:
type: boolean
description: If false (or undefined) the workflow runs in dry-run mode (i.e. with no side-effects)
required: false
default: false
version:
type: string
description: Release number. If undefined, the workflow auto-generates a version using git-describe
Expand All @@ -33,7 +34,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/tag-crates.yml@main
with:
repo: ${{ github.repository }}
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ inputs.version }}
inter-deps-pattern: zenoh.*
secrets: inherit
Expand All @@ -56,7 +57,6 @@ jobs:
repo: ${{ github.repository }}
version: ${{ needs.tag.outputs.version }}
branch: ${{ needs.tag.outputs.branch }}
exclude-builds: '[{ build: { target: "x86_64-pc-windows-gnu", os: "windows-2019" } }]'
artifact-patterns: |
^zenohd(\.exe)?$
^libzenoh_plugin_(rest|storage_manager)\.(dylib|so)$
Expand All @@ -69,7 +69,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main
with:
repos: ${{ github.repository }}
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
branch: ${{ needs.tag.outputs.branch }}
inter-deps-pattern: zenoh.*
secrets: inherit
Expand All @@ -80,7 +80,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-debian.yml@main
with:
no-build: true
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
repo: ${{ github.repository }}
branch: ${{ needs.tag.outputs.branch }}
Expand All @@ -93,7 +93,7 @@ jobs:
with:
no-build: true
repo: ${{ github.repository }}
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
branch: ${{ needs.tag.outputs.branch }}
artifact-patterns: |
Expand All @@ -113,7 +113,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-eclipse.yml@main
with:
no-build: true
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
repo: ${{ github.repository }}
branch: ${{ needs.tag.outputs.branch }}
Expand All @@ -130,7 +130,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-github.yml@main
with:
no-build: true
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
repo: ${{ github.repository }}
branch: ${{ needs.tag.outputs.branch }}
Expand All @@ -146,7 +146,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-dockerhub.yml@main
with:
no-build: true
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
repo: ${{ github.repository }}
tags: "eclipse/zenoh:${{ needs.tag.outputs.version }}"
Expand All @@ -166,7 +166,7 @@ jobs:
uses: eclipse-zenoh/ci/.github/workflows/release-crates-ghcr.yml@main
with:
no-build: true
live-run: ${{ inputs.live-run }}
live-run: ${{ inputs.live-run || false }}
version: ${{ needs.tag.outputs.version }}
repo: ${{ github.repository }}
tags: "${{ github.repository }}:${{ needs.tag.outputs.version }}"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

.vscode

cargo-timing*.html
cargo-timing*.html
Loading