Skip to content

Commit 7c657f8

Browse files
committed
Fix several issues in the test-users script.
- In the Rust build, use a downloaded LLVM to avoid needing the dependencies needed to build LLVM. - Fix the name of the ostree-rs-ext repository. - Install libostree-dev for the ostree-rs-ext build. - Launch a dbus-daemon for the dbus-rs tests to use.
1 parent 32b50d5 commit 7c657f8

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

.github/workflows/test-users.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ jobs:
238238
- run: cd cap-std-ext && echo 'rustix = { path = ".." }' >> Cargo.toml
239239
- run: cd cap-std-ext && cargo test
240240

241-
ostree-ext:
242-
name: ostree-ext
241+
ostree-rs-ext:
242+
name: ostree-rs-ext
243243
runs-on: ${{ matrix.os }}
244244
strategy:
245245
matrix:
@@ -257,11 +257,13 @@ jobs:
257257
toolchain: ${{ matrix.rust }}
258258
- uses: actions/checkout@v2
259259
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
265267

266268
dbus-rs:
267269
name: dbus-rs ported to rustix
@@ -288,7 +290,7 @@ jobs:
288290
- run: sudo apt-get install -y libdbus-1-dev
289291
- run: cd dbus-rs && echo '[patch.crates-io]' >> Cargo.toml
290292
- 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
292294

293295
mustang:
294296
name: mustang
@@ -340,6 +342,9 @@ jobs:
340342
repository: sunfishcode/rust
341343
path: rust
342344
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
343348
- run: cd rust && sed -i 's/\<git = "https:\/\/github\.com\/bytecodealliance\/rustix", branch = "rustc-dep-of-std"/path = "..\/..\/.."/' library/std/Cargo.toml
344349
- run: cd rust && ./x.py test library/std --stage=0
345350
# See <https://github.com/bytecodealliance/rustix/issues/76#issuecomment-962196433>

0 commit comments

Comments
 (0)