Skip to content

Commit

Permalink
Merge pull request #872 from eclipse-zenoh/protocol_tokio
Browse files Browse the repository at this point in the history
Merge main into protocol_changes
  • Loading branch information
milyin authored Mar 28, 2024
2 parents 9809799 + 7162ff1 commit 90a149e
Show file tree
Hide file tree
Showing 167 changed files with 5,515 additions and 4,583 deletions.
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

0 comments on commit 90a149e

Please sign in to comment.