Skip to content

Commit 2ec115b

Browse files
committed
ci: fix sccache cache mode
1 parent 8f161e9 commit 2ec115b

5 files changed

Lines changed: 8 additions & 17 deletions

File tree

.cross/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ENV CC=clang \
1515
CXX=clang++ \
1616
AR=llvm-ar \
1717
RUSTC_WRAPPER="/usr/bin/sccache" \
18-
SCCACHE_DIRECT=true
18+
SCCACHE_DIR="/tmp/sccache"

Cross.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[build.env]
2-
passthrough = ["RUSTFLAGS", "RUSTC_BOOTSTRAP", "SCCACHE_GHA_ENABLED", "ACTIONS_RESULTS_URL", "ACTIONS_RUNTIME_TOKEN"]
2+
passthrough = ["RUSTFLAGS", "RUSTC_BOOTSTRAP"]
3+
volumes = ["/tmp=/tmp"]
34

45
# Use clang as the C/C++ compiler to avoid the aws-lc-sys GCC memcmp bug
56
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189

crates/wind-tuic/src/proto/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ pub fn decode_command(cmd_type: CmdType, buf: &mut impl Buf, context: &str) -> R
7474
if buf.remaining() < 2 {
7575
return Err(eyre!("Incomplete dissociate command in {}", context));
7676
}
77-
Ok(Command::Dissociate {
78-
assoc_id: buf.get_u16(),
79-
})
77+
Ok(Command::Dissociate { assoc_id: buf.get_u16() })
8078
}
8179
CmdType::Heartbeat => Ok(Command::Heartbeat),
8280
CmdType::Other(v) => Err(eyre!("Unknown command type: {}", v)),

crates/wind-tuic/src/proto/udp_stream.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,13 @@ impl FragmentReassemblyBuffer {
171171
.map(|arc| Arc::try_unwrap(arc).unwrap_or_else(|a| (*a).clone()));
172172
let target = Arc::try_unwrap(m.target.into_inner()).unwrap_or_else(|a| (*a).clone());
173173

174-
Some(UdpPacket {
175-
source,
176-
target,
177-
payload,
178-
})
174+
Some(UdpPacket { source, target, payload })
179175
}
180176
Err(arc) => {
181177
let source = arc.source.load().as_ref().map(|a| (**a).clone());
182178
let target = (**arc.target.load()).clone();
183179

184-
Some(UdpPacket {
185-
source,
186-
target,
187-
payload,
188-
})
180+
Some(UdpPacket { source, target, payload })
189181
}
190182
}
191183
} else {

crates/wind-tuic/src/quinn/inbound.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ async fn read_address_exact(recv: &mut quinn::RecvStream) -> eyre::Result<crate:
766766
.map_err(|e| eyre::eyre!("Failed to read domain port: {}", e))?;
767767
let port = u16::from_be_bytes(port_buf);
768768

769-
let domain_str = String::from_utf8(domain_slice.to_vec())
770-
.map_err(|_| eyre::eyre!("Invalid UTF-8 domain address"))?;
769+
let domain_str =
770+
String::from_utf8(domain_slice.to_vec()).map_err(|_| eyre::eyre!("Invalid UTF-8 domain address"))?;
771771
Ok(crate::proto::Address::Domain(domain_str, port))
772772
}
773773
t => Err(eyre::eyre!("Unknown address type byte 0x{:02x}", t)),

0 commit comments

Comments
 (0)