Skip to content

Commit b281ceb

Browse files
authored
fix(s2n-quic-xdp): correct tokio feature dependency (#1808)
1 parent 8f3f058 commit b281ceb

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ jobs:
4242
# examples is populated by
4343
# find all child folders in the examples directory
4444
# jq -R - raw content is passed in (not json, just strings)
45-
# jq -sc - slurp the content into a single object, -c enabled compact
46-
# output onto a single line, github will fail to parse the multi line.
45+
# jq -s - slurp the content into an object
46+
# jq '. += ' adds the s2n-quic-xdp crate to the list of crates we build
47+
# Many of the xdp crates have much more complex build processes, so we
48+
# don't try to build all of them.
49+
# jq -c - output the object in (c)ompact mode on a single line, github
50+
# will fail to parse multi line output
4751
#
4852
# the output is echo'd to make debugging easier
4953
- name: Evaluate definitions
@@ -59,7 +63,7 @@ jobs:
5963
export EXAMPLES=$(find examples/ -maxdepth 1 -mindepth 1 -type d | jq -R | jq -sc)
6064
echo "examples=$EXAMPLES"
6165
echo "examples=$EXAMPLES" >> $GITHUB_OUTPUT
62-
export CRATES=$(find quic common -name *Cargo.toml | jq -R | jq -sc)
66+
export CRATES=$(find quic common -name *Cargo.toml | jq -R | jq -s | jq '. += ["tools/xdp/s2n-quic-xdp/Cargo.toml"]' | jq -c)
6367
echo "crates=$CRATES"
6468
echo "crates=$CRATES" >> $GITHUB_OUTPUT
6569

tools/xdp/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[workspace]
22
members = ["s2n-quic-xdp", "tester", "xtask"]
3+
resolver = "2"

tools/xdp/s2n-quic-xdp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ errno = "0.3"
2020
libc = "0.2"
2121
s2n-codec = { version = "=0.5.0", path = "../../../common/s2n-codec" }
2222
s2n-quic-core = { version = "=0.22.0", path = "../../../quic/s2n-quic-core" }
23-
tokio = { version = "1", optional = true }
23+
tokio = { version = "1", features = ["net"], optional = true }
2424

2525
[dev-dependencies]
2626
bolero = "0.9"

0 commit comments

Comments
 (0)