Skip to content

Commit 13e80b7

Browse files
authored
Merge pull request #78 from openssh-rust/use-cargo-llvm-cov
Use `cargo-llvm-cov` instead of `cargo-tarpaulin` to test coverage
2 parents 38ca631 + bacf7ef commit 13e80b7

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/coverage.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,22 @@ name: coverage
1818
jobs:
1919
test:
2020
runs-on: ubuntu-latest
21-
container:
22-
image: xd009642/tarpaulin
23-
options: --security-opt seccomp=unconfined
2421
steps:
25-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
23+
- uses: actions-rs/toolchain@v1
24+
with:
25+
profile: minimal
26+
toolchain: stable
27+
override: true
28+
components: llvm-tools-preview
29+
- name: Install cargo-llvm-cov
30+
uses: taiki-e/install-action@cargo-llvm-cov
2631
- run: |
32+
# Wait for startup of openssh-server
33+
sleep 30
2734
chmod 600 .test-key
2835
mkdir /tmp/openssh-rs
29-
ssh -i .test-key -v -p 2222 -l test-user openssh -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/tmp/openssh-rs/known_hosts whoami
36+
ssh -i .test-key -v -p 2222 -l test-user localhost -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/tmp/openssh-rs/known_hosts whoami
3037
name: Test ssh connectivity
3138
- run: |
3239
eval $(ssh-agent)
@@ -35,14 +42,13 @@ jobs:
3542
cat .test-key | ssh-add -
3643
name: Set up ssh-agent
3744
- name: Generate code coverage
38-
run: |
39-
cargo tarpaulin --verbose --timeout 300 --out Xml --forward --all-features
45+
run: cargo llvm-cov --all-features --lcov --output-path lcov.info
4046
env:
4147
# makes all the ignored tests not ignored
4248
RUSTFLAGS: --cfg=ci
4349
# we cannot use 127.0.0.1 (the default here)
4450
# since we are running from a different container
45-
TEST_HOST: ssh://test-user@openssh:2222
51+
TEST_HOST: ssh://test-user@localhost:2222
4652
- name: Upload to codecov.io
4753
uses: codecov/codecov-action@v2
4854
with:

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/target
22
/ci-target
33
Cargo.lock
4+
5+
.DS_Store

0 commit comments

Comments
 (0)