@@ -238,8 +238,8 @@ jobs:
238
238
- run : cd cap-std-ext && echo 'rustix = { path = ".." }' >> Cargo.toml
239
239
- run : cd cap-std-ext && cargo test
240
240
241
- ostree-ext :
242
- name : ostree-ext
241
+ ostree-rs- ext :
242
+ name : ostree-rs- ext
243
243
runs-on : ${{ matrix.os }}
244
244
strategy :
245
245
matrix :
@@ -257,11 +257,13 @@ jobs:
257
257
toolchain : ${{ matrix.rust }}
258
258
- uses : actions/checkout@v2
259
259
with :
260
- repository : ostreedev/ostree-ext
261
- path : ostree-ext
262
- - run : cd ostree-ext && echo '[patch.crates-io]' >> Cargo.toml
263
- - run : cd ostree-ext && echo 'rustix = { path = ".." }' >> Cargo.toml
264
- - run : cd ostree-ext && cargo test
260
+ repository : ostreedev/ostree-rs-ext
261
+ path : ostree-rs-ext
262
+ - run : sudo apt-get update
263
+ - run : sudo apt-get install -y libostree-dev
264
+ - run : cd ostree-rs-ext && echo '[patch.crates-io]' >> Cargo.toml
265
+ - run : cd ostree-rs-ext && echo 'rustix = { path = ".." }' >> Cargo.toml
266
+ - run : cd ostree-rs-ext && cargo test
265
267
266
268
dbus-rs :
267
269
name : dbus-rs ported to rustix
@@ -288,7 +290,7 @@ jobs:
288
290
- run : sudo apt-get install -y libdbus-1-dev
289
291
- run : cd dbus-rs && echo '[patch.crates-io]' >> Cargo.toml
290
292
- run : cd dbus-rs && echo 'rustix = { path = ".." }' >> Cargo.toml
291
- - run : cd dbus-rs && cargo test
293
+ - run : cd dbus-rs && env DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --session --print-address --fork` cargo test --workspace
292
294
293
295
mustang :
294
296
name : mustang
@@ -340,6 +342,9 @@ jobs:
340
342
repository : sunfishcode/rust
341
343
path : rust
342
344
ref : rustix
345
+ # Download a pre-built LLVM instead of building it from source.
346
+ - run : cd rust && echo "[llvm]" >> config.toml
347
+ - run : cd rust && echo "download-ci-llvm = true" >> config.toml
343
348
- run : cd rust && sed -i 's/\<git = "https:\/\/github\.com\/bytecodealliance\/rustix", branch = "rustc-dep-of-std"/path = "..\/..\/.."/' library/std/Cargo.toml
344
349
- run : cd rust && ./x.py test library/std --stage=0
345
350
# See <https://github.com/bytecodealliance/rustix/issues/76#issuecomment-962196433>
0 commit comments