Skip to content

Commit

Permalink
merge eclipse-zenoh/main, Sync Cargo.locl
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles-Schleich committed Nov 7, 2024
2 parents 799958a + 03e9e1e commit 583dfae
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 31 deletions.
35 changes: 35 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# 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: Breaking changes 💥
labels:
- breaking-change
- title: New features 🎉
labels:
- enhancement
- new feature
- title: Bug fixes 🐞
labels:
- bug
- title: Documentation 📝
labels:
- documentation
- title: Dependencies 👷
labels:
- dependencies
- title: Other changes
labels:
- "*"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
56 changes: 28 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[target.x86_64-unknown-linux-musl]
image = "jenoch/rust-cross:x86_64-unknown-linux-musl"

[target.arm-unknown-linux-gnueabi]
image = "jenoch/rust-cross:arm-unknown-linux-gnueabi"

[target.arm-unknown-linux-gnueabihf]
image = "jenoch/rust-cross:arm-unknown-linux-gnueabihf"

[target.armv7-unknown-linux-gnueabihf]
image = "jenoch/rust-cross:armv7-unknown-linux-gnueabihf"

[target.aarch64-unknown-linux-gnu]
image = "jenoch/rust-cross:aarch64-unknown-linux-gnu"

[target.aarch64-unknown-linux-musl]
image = "jenoch/rust-cross:aarch64-unknown-linux-musl"

2 changes: 1 addition & 1 deletion zenoh-plugin-remote-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[package]
rust-version = "1.75.0"
name = "zenoh-plugin-remote-api"
version = "1.0.0" # Zenoh version
version = "1.0.0-dev" # Zenoh version
repository = "https://github.com/eclipse-zenoh/zenoh-ts"
homepage = "http://zenoh.io"
authors = [
Expand Down
4 changes: 2 additions & 2 deletions zenoh-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-zenoh/zenoh-ts",
"version": "0.0.9",
"version": "1.0.0-dev",
"license": "(Apache-2.0 OR EPL-2.0)",
"type": "module",
"exports": {
Expand Down Expand Up @@ -39,4 +39,4 @@
"access": "restricted",
"registry": "https://npm.pkg.github.com"
}
}
}

0 comments on commit 583dfae

Please sign in to comment.