Skip to content

Commit 0c4f6c1

Browse files
authored
Merge pull request #47 from afshinm/codex-v0.130
chore: upgrade codex to 0.130 + fix "Bad file descriptor" on bwrap
2 parents 98695b0 + 11e4843 commit 0c4f6c1

20 files changed

Lines changed: 2623 additions & 730 deletions

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
name: upstream
122122
path: upstream/
123123
- name: Install system deps
124-
run: sudo apt-get update && sudo apt-get install -y libcap-dev
124+
run: sudo apt-get update && sudo apt-get install -y bubblewrap libcap-dev
125125
- name: Enable unprivileged user namespaces (required by bubblewrap)
126126
run: |
127127
# Required for bubblewrap to work on Linux CI runners.
@@ -151,7 +151,7 @@ jobs:
151151
include:
152152
- os: macos-latest
153153
- os: ubuntu-latest
154-
system-deps: libcap-dev
154+
system-deps: bubblewrap libcap-dev
155155
enable-userns: true
156156
runs-on: ${{ matrix.os }}
157157
steps:
@@ -204,7 +204,7 @@ jobs:
204204
include:
205205
- os: macos-latest
206206
- os: ubuntu-latest
207-
system-deps: libcap-dev
207+
system-deps: bubblewrap libcap-dev
208208
enable-userns: true
209209
runs-on: ${{ matrix.os }}
210210
steps:

Cargo.lock

Lines changed: 49 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ members = [
1414
"crates/zerobox",
1515
"crates/zerobox-snapshot",
1616
"crates/zerobox-protocol",
17+
"crates/zerobox-otel",
1718
]
1819
resolver = "2"
1920

@@ -29,6 +30,7 @@ categories = ["command-line-utilities", "os"]
2930

3031
[workspace.dependencies]
3132
zerobox-linux-sandbox = { version = "=0.2.6", path = "upstream/linux-sandbox" }
33+
zerobox-otel = { version = "=0.2.6", path = "crates/zerobox-otel" }
3234
zerobox-process-hardening = { version = "=0.2.6", path = "upstream/process-hardening" }
3335
zerobox-protocol = { version = "=0.2.6", path = "crates/zerobox-protocol" }
3436
zerobox-sandboxing = { version = "=0.2.6", path = "upstream/sandboxing" }
@@ -48,6 +50,7 @@ chrono = "0.4.43"
4850
clap = "4"
4951
dirs = "6"
5052
dunce = "1.0.4"
53+
glob = "0.3"
5154
globset = "0.4"
5255
landlock = "0.4.4"
5356
lazy_static = "1"
@@ -63,6 +66,7 @@ seccompiler = "0.5.0"
6366
serde = "1"
6467
serde_json = "1"
6568
sha1 = "0.10.6"
69+
sha2 = "0.10"
6670
strum = "0.27.2"
6771
strum_macros = "0.28.0"
6872
tempfile = "3.23.0"

UPSTREAM_VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
rust-v0.122.0
2-
# commit: 9957201df78e623df2a27fa39e5cf2beaf359dc9
3-
# synced: 2026-04-18T16:30:59Z
1+
rust-v0.131.0-alpha.22
2+
# commit: 9b8cf56cdefb09f54564ccc295fd42f6647f558f
3+
# synced: 2026-05-16T21:01:55Z

crates/zerobox-otel/Cargo.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[package]
2+
name = "zerobox-otel"
3+
version.workspace = true
4+
edition.workspace = true
5+
license.workspace = true
6+
description.workspace = true
7+
repository.workspace = true
8+
homepage.workspace = true
9+
10+
[lib]
11+
name = "zerobox_otel"
12+
path = "src/lib.rs"
13+
14+
[dependencies]
15+
serde = { workspace = true, features = ["derive"] }
16+
17+
[lints]
18+
workspace = true

0 commit comments

Comments
 (0)