Skip to content

Commit bcc4c76

Browse files
ci: Make sure we test and build correct cases
1 parent 13f034c commit bcc4c76

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

.github/workflows/CI.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: CI
88
jobs:
99
check:
1010
name: Check
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
1414
- uses: actions-rs/toolchain@v1
@@ -23,28 +23,40 @@ jobs:
2323

2424
test:
2525
name: Test Suite
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@v4
29-
- name: Install dependencies
30-
run: |
31-
sudo apt-get install gnome-keyring dbus dbus-x11 -y
32-
gnome-keyring-daemon -d
3329
- uses: actions-rs/toolchain@v1
3430
with:
3531
profile: minimal
3632
toolchain: stable
3733
override: true
38-
- name: Build and test
34+
- name: Build client (async-std / native)
35+
run: |
36+
cargo build --manifest-path ./client/Cargo.toml --no-default-features --features async-std --features native_crypto
37+
- name: Build client (async-std / OpenSSL)
38+
run: |
39+
cargo build --manifest-path ./client/Cargo.toml --no-default-features --features async-std --features openssl_crypto
40+
- name: Build client (tokio / native)
41+
run: |
42+
cargo build --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features native_crypto
43+
- name: Build client (tokio / OpenSSL)
44+
run: |
45+
cargo build --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features openssl_crypto
46+
- name: Build CLI
47+
run: |
48+
cargo build --manifest-path ./cli/Cargo.toml
49+
50+
- name: Test (native)
3951
run: |
40-
dbus-run-session -- cargo test --no-default-features --features async-std --features native_crypto
41-
- name: Build and test (OpenSSL)
52+
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features async-std --features native_crypto
53+
- name: Test (OpenSSL)
4254
run: |
43-
dbus-run-session -- cargo test --no-default-features --features async-std --features openssl_crypto
55+
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features async-std --features openssl_crypto
4456
4557
fmt:
4658
name: Rustfmt
47-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-latest
4860
steps:
4961
- uses: actions/checkout@v4
5062
- uses: actions-rs/toolchain@v1
@@ -61,7 +73,7 @@ jobs:
6173

6274
clippy:
6375
name: Clippy
64-
runs-on: ubuntu-20.04
76+
runs-on: ubuntu-latest
6577
steps:
6678
- uses: actions/checkout@v4
6779
- uses: actions-rs/toolchain@v1

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build-deploy:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
1313
- uses: actions-rs/toolchain@v1

0 commit comments

Comments
 (0)