Compare commits

...

4 Commits

Author SHA1 Message Date
dedc514944 chore: release (#33)
Signed-off-by: edera-cultivation[bot] <165992271+edera-cultivation[bot]@users.noreply.github.com>
Co-authored-by: edera-cultivation[bot] <165992271+edera-cultivation[bot]@users.noreply.github.com>
2024-04-09 02:50:52 -07:00
9c0597157b fix: increase channel acquisition timeout to support lower performance hosts (#36) 2024-04-09 02:36:22 -07:00
3f8c9e7a7c chore(workflows): prefix all jobs with workflow name to help distinguish (#35) 2024-04-09 00:05:06 -07:00
6ed31bc436 build(deps): bump prost-build from 0.12.3 to 0.12.4 (#34)
Bumps [prost-build](https://github.com/tokio-rs/prost) from 0.12.3 to 0.12.4.
- [Release notes](https://github.com/tokio-rs/prost/releases)
- [Commits](https://github.com/tokio-rs/prost/compare/v0.12.3...v0.12.4)

---
updated-dependencies:
- dependency-name: prost-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-09 05:52:14 +00:00
17 changed files with 58 additions and 79 deletions

View File

@ -22,7 +22,7 @@ jobs:
TARGET_OS: "${{ matrix.platform.os }}" TARGET_OS: "${{ matrix.platform.os }}"
TARGET_ARCH: "${{ matrix.platform.arch }}" TARGET_ARCH: "${{ matrix.platform.arch }}"
runs-on: "${{ matrix.platform.on }}" runs-on: "${{ matrix.platform.on }}"
name: build ${{ matrix.platform.os }}-${{ matrix.platform.arch }} name: client build ${{ matrix.platform.os }}-${{ matrix.platform.arch }}
defaults: defaults:
run: run:
shell: bash shell: bash

View File

@ -20,7 +20,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: build ${{ matrix.arch }} name: kernel build ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:

View File

@ -14,7 +14,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: server ${{ matrix.arch }} name: nightly server ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -70,7 +70,7 @@ jobs:
TARGET_OS: "${{ matrix.platform.os }}" TARGET_OS: "${{ matrix.platform.os }}"
TARGET_ARCH: "${{ matrix.platform.arch }}" TARGET_ARCH: "${{ matrix.platform.arch }}"
runs-on: "${{ matrix.platform.on }}" runs-on: "${{ matrix.platform.on }}"
name: client ${{ matrix.platform.os }}-${{ matrix.platform.arch }} name: nightly client ${{ matrix.platform.os }}-${{ matrix.platform.arch }}
defaults: defaults:
run: run:
shell: bash shell: bash

View File

@ -21,7 +21,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: build ${{ matrix.arch }} name: os build ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:

View File

@ -23,7 +23,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: server ${{ matrix.arch }} name: release-binaries server ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -63,7 +63,7 @@ jobs:
TARGET_OS: "${{ matrix.platform.os }}" TARGET_OS: "${{ matrix.platform.os }}"
TARGET_ARCH: "${{ matrix.platform.arch }}" TARGET_ARCH: "${{ matrix.platform.arch }}"
runs-on: "${{ matrix.platform.on }}" runs-on: "${{ matrix.platform.on }}"
name: client ${{ matrix.platform.os }}-${{ matrix.platform.arch }} name: release-binaries client ${{ matrix.platform.os }}-${{ matrix.platform.arch }}
defaults: defaults:
run: run:
shell: bash shell: bash

View File

@ -8,6 +8,7 @@ on:
- main - main
concurrency: concurrency:
group: "${{ github.workflow }}" group: "${{ github.workflow }}"
cancel-in-progress: true
jobs: jobs:
release-plz: release-plz:
name: release-plz name: release-plz

View File

@ -17,7 +17,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: build ${{ matrix.arch }} name: server build ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -34,7 +34,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: test ${{ matrix.arch }} name: server test ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -51,7 +51,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: clippy ${{ matrix.arch }} name: server clippy ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -70,7 +70,7 @@ jobs:
- aarch64 - aarch64
env: env:
TARGET_ARCH: "${{ matrix.arch }}" TARGET_ARCH: "${{ matrix.arch }}"
name: initrd ${{ matrix.arch }} name: server initrd ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:

View File

@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [0.0.6](https://github.com/edera-dev/krata/compare/v0.0.5...v0.0.6) - 2024-04-09
### Fixed
- increase channel acquisition timeout to support lower performance hosts ([#36](https://github.com/edera-dev/krata/pull/36))
### Other
- update Cargo.toml dependencies
- update Cargo.lock dependencies
## [0.0.5](https://github.com/edera-dev/krata/compare/v0.0.4...v0.0.5) - 2024-04-09 ## [0.0.5](https://github.com/edera-dev/krata/compare/v0.0.4...v0.0.5) - 2024-04-09
### Added ### Added

71
Cargo.lock generated
View File

@ -240,7 +240,7 @@ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.12.1", "itertools",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"proc-macro2", "proc-macro2",
@ -973,15 +973,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "home"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.12" version = "0.2.12"
@ -1199,15 +1190,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.12.1" version = "0.12.1"
@ -1243,7 +1225,7 @@ dependencies = [
[[package]] [[package]]
name = "krata" name = "krata"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -1277,7 +1259,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-ctl" name = "krata-ctl"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -1299,7 +1281,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-daemon" name = "krata-daemon"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -1323,7 +1305,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-guest" name = "krata-guest"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cgroups-rs", "cgroups-rs",
@ -1347,7 +1329,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-network" name = "krata-network"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -1371,7 +1353,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-oci" name = "krata-oci"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@ -1396,7 +1378,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-runtime" name = "krata-runtime"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backhand", "backhand",
@ -1433,7 +1415,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-xencall" name = "krata-xencall"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"libc", "libc",
@ -1446,7 +1428,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-xenclient" name = "krata-xenclient"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"elf", "elf",
@ -1467,7 +1449,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-xenevtchn" name = "krata-xenevtchn"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@ -1478,7 +1460,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-xengnt" name = "krata-xengnt"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"libc", "libc",
"nix 0.28.0", "nix 0.28.0",
@ -1487,7 +1469,7 @@ dependencies = [
[[package]] [[package]]
name = "krata-xenstore" name = "krata-xenstore"
version = "0.0.5" version = "0.0.6"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"env_logger", "env_logger",
@ -1970,13 +1952,13 @@ dependencies = [
[[package]] [[package]]
name = "prost-build" name = "prost-build"
version = "0.12.3" version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
dependencies = [ dependencies = [
"bytes", "bytes",
"heck 0.4.1", "heck 0.5.0",
"itertools 0.11.0", "itertools",
"log", "log",
"multimap", "multimap",
"once_cell", "once_cell",
@ -1987,7 +1969,6 @@ dependencies = [
"regex", "regex",
"syn 2.0.57", "syn 2.0.57",
"tempfile", "tempfile",
"which",
] ]
[[package]] [[package]]
@ -1997,7 +1978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.12.1", "itertools",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.57", "syn 2.0.57",
@ -2041,9 +2022,9 @@ dependencies = [
[[package]] [[package]]
name = "prost-types" name = "prost-types"
version = "0.12.3" version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
dependencies = [ dependencies = [
"prost", "prost",
] ]
@ -3059,18 +3040,6 @@ dependencies = [
"rustls-pki-types", "rustls-pki-types",
] ]
[[package]]
name = "which"
version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
dependencies = [
"either",
"home",
"once_cell",
"rustix",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"

View File

@ -16,7 +16,7 @@ members = [
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
version = "0.0.5" version = "0.0.6"
homepage = "https://krata.dev" homepage = "https://krata.dev"
license = "Apache-2.0" license = "Apache-2.0"
repository = "https://github.com/edera-dev/krata" repository = "https://github.com/edera-dev/krata"
@ -53,7 +53,7 @@ once_cell = "1.19.0"
path-absolutize = "3.1.1" path-absolutize = "3.1.1"
path-clean = "1.0.1" path-clean = "1.0.1"
prost = "0.12.4" prost = "0.12.4"
prost-build = "0.12.3" prost-build = "0.12.4"
prost-reflect-build = "0.13.0" prost-reflect-build = "0.13.0"
rand = "0.8.5" rand = "0.8.5"
redb = "2.0.0" redb = "2.0.0"

View File

@ -16,7 +16,7 @@ comfy-table = { workspace = true }
crossterm = { workspace = true } crossterm = { workspace = true }
ctrlc = { workspace = true, features = ["termination"] } ctrlc = { workspace = true, features = ["termination"] }
env_logger = { workspace = true } env_logger = { workspace = true }
krata = { path = "../krata", version = "^0.0.5" } krata = { path = "../krata", version = "^0.0.6" }
log = { workspace = true } log = { workspace = true }
prost-reflect = { workspace = true, features = ["serde"] } prost-reflect = { workspace = true, features = ["serde"] }
serde_json = { workspace = true } serde_json = { workspace = true }

View File

@ -17,8 +17,8 @@ circular-buffer = { workspace = true }
clap = { workspace = true } clap = { workspace = true }
env_logger = { workspace = true } env_logger = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
krata = { path = "../krata", version = "^0.0.5" } krata = { path = "../krata", version = "^0.0.6" }
krata-runtime = { path = "../runtime", version = "^0.0.5" } krata-runtime = { path = "../runtime", version = "^0.0.6" }
log = { workspace = true } log = { workspace = true }
prost = { workspace = true } prost = { workspace = true }
redb = { workspace = true } redb = { workspace = true }

View File

@ -14,8 +14,8 @@ cgroups-rs = { workspace = true }
env_logger = { workspace = true } env_logger = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
ipnetwork = { workspace = true } ipnetwork = { workspace = true }
krata = { path = "../krata", version = "^0.0.5" } krata = { path = "../krata", version = "^0.0.6" }
krata-xenstore = { path = "../xen/xenstore", version = "^0.0.5" } krata-xenstore = { path = "../xen/xenstore", version = "^0.0.6" }
libc = { workspace = true } libc = { workspace = true }
log = { workspace = true } log = { workspace = true }
nix = { workspace = true, features = ["ioctl", "process", "fs"] } nix = { workspace = true, features = ["ioctl", "process", "fs"] }

View File

@ -16,7 +16,7 @@ clap = { workspace = true }
env_logger = { workspace = true } env_logger = { workspace = true }
etherparse = { workspace = true } etherparse = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
krata = { path = "../krata", version = "^0.0.5" } krata = { path = "../krata", version = "^0.0.6" }
krata-advmac = { workspace = true } krata-advmac = { workspace = true }
libc = { workspace = true } libc = { workspace = true }
log = { workspace = true } log = { workspace = true }

View File

@ -12,18 +12,18 @@ resolver = "2"
anyhow = { workspace = true } anyhow = { workspace = true }
backhand = { workspace = true } backhand = { workspace = true }
ipnetwork = { workspace = true } ipnetwork = { workspace = true }
krata = { path = "../krata", version = "^0.0.5" } krata = { path = "../krata", version = "^0.0.6" }
krata-advmac = { workspace = true } krata-advmac = { workspace = true }
krata-oci = { path = "../oci", version = "^0.0.5" } krata-oci = { path = "../oci", version = "^0.0.6" }
log = { workspace = true } log = { workspace = true }
loopdev-3 = { workspace = true } loopdev-3 = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
krata-xenclient = { path = "../xen/xenclient", version = "^0.0.5" } krata-xenclient = { path = "../xen/xenclient", version = "^0.0.6" }
krata-xenevtchn = { path = "../xen/xenevtchn", version = "^0.0.5" } krata-xenevtchn = { path = "../xen/xenevtchn", version = "^0.0.6" }
krata-xengnt = { path = "../xen/xengnt", version = "^0.0.5" } krata-xengnt = { path = "../xen/xengnt", version = "^0.0.6" }
krata-xenstore = { path = "../xen/xenstore", version = "^0.0.5" } krata-xenstore = { path = "../xen/xenstore", version = "^0.0.6" }
[lib] [lib]
name = "kratart" name = "kratart"

View File

@ -346,7 +346,7 @@ impl KrataChannelBackendProcessor {
.read_string(format!("{}/port", self.frontend)) .read_string(format!("{}/port", self.frontend))
.await?; .await?;
if (ring_ref.is_none() || port.is_none()) && tries < 10 { if (ring_ref.is_none() || port.is_none()) && tries < 40 {
tries += 1; tries += 1;
self.store self.store
.write_string(format!("{}/state", self.backend), "4") .write_string(format!("{}/state", self.backend), "4")

View File

@ -14,8 +14,8 @@ elf = { workspace = true }
flate2 = { workspace = true } flate2 = { workspace = true }
libc = { workspace = true } libc = { workspace = true }
log = { workspace = true } log = { workspace = true }
krata-xencall = { path = "../xencall", version = "^0.0.5" } krata-xencall = { path = "../xencall", version = "^0.0.6" }
krata-xenstore = { path = "../xenstore", version = "^0.0.5" } krata-xenstore = { path = "../xenstore", version = "^0.0.6" }
memchr = { workspace = true } memchr = { workspace = true }
nix = { workspace = true } nix = { workspace = true }
slice-copy = { workspace = true } slice-copy = { workspace = true }