Skip to content

Commit 591cb02

Browse files
committed
👷 CI: Configure CI to install and run IBus daemon
1 parent 08653ce commit 591cb02

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

‎.github/workflows/rust.yml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,40 @@ jobs:
9292
sudo mkdir -p /run/user/$UID |
9393
sed -e s/UID/$UID/ -e s/PATH/path/ CI/dbus-session.conf > /tmp/dbus-session.conf
9494
sed -e s/UID/$UID/ -e s/PATH/abstract/ CI/dbus-session.conf > /tmp/dbus-session-abstract.conf
95-
sudo apt-get install -y dbus
95+
sudo apt-get update
96+
sudo apt-get install -y dbus ibus
9697
- uses: dtolnay/rust-toolchain@master
9798
with:
9899
toolchain: stable
99100
components: rustfmt
100101
- uses: Swatinem/rust-cache@v2
101102
- name: Build and Test
102103
run: |
103-
dbus-run-session --config-file /tmp/dbus-session-abstract.conf -- cargo --locked test --release --verbose -- basic_connection
104-
# All features except tokio.
105-
dbus-run-session --config-file /tmp/dbus-session.conf -- \
104+
# Start IBus daemon for testing
105+
dbus-run-session --config-file /tmp/dbus-session.conf -- sh -c '
106+
ibus-daemon -d --xim &
107+
IBUS_PID=$!
108+
sleep 2
109+
110+
cargo --locked test --release --verbose -- basic_connection
111+
112+
# All features except tokio.
106113
cargo --locked test --release --verbose --features uuid,url,time,chrono,option-as-array,vsock,bus-impl \
107114
-- --skip fdpass_systemd
108-
# Test tokio support.
109-
dbus-run-session --config-file /tmp/dbus-session.conf -- \
115+
116+
# Test tokio support.
110117
cargo --locked test --release --verbose --tests -p zbus --no-default-features \
111118
--features tokio-vsock -- --skip fdpass_systemd
112-
dbus-run-session --config-file /tmp/dbus-session.conf -- \
119+
113120
cargo --locked test --release --verbose --doc --no-default-features connection::Connection::executor
121+
122+
# Stop IBus
123+
kill $IBUS_PID || true
124+
'
125+
126+
# Test with abstract socket
127+
dbus-run-session --config-file /tmp/dbus-session-abstract.conf -- cargo --locked test --release --verbose -- basic_connection
128+
114129
# zvariant only with ostree tests (which implicitly enables `gvariant` feature too).
115130
cargo --locked t -p zvariant --features ostree-tests
116131

0 commit comments

Comments
 (0)