Skip to content

Commit

Permalink
ci: random fixes (#33)
Browse files Browse the repository at this point in the history
  • Loading branch information
camshaft authored Jul 15, 2020
1 parent ed553e2 commit c472f60
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 38 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ jobs:

udeps:
runs-on: ubuntu-latest
env:
RUSTC_WRAPPER: sccache
steps:
- uses: actions-rs/toolchain@v1
with:
Expand All @@ -106,42 +104,9 @@ jobs:

- uses: actions/checkout@v2

- name: Install sccache
uses: actions-rs/[email protected]
with:
crate: sccache
use-tool-cache: true
version: latest

- name: Generate Cargo.lock
run: cargo update

- name: Cache cargo registry
uses: actions/cache@v2
continue-on-error: true
with:
path: ~/.cargo/registry/cache
key: ${{ runner.os }}-${{ github.job }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-${{ github.job }}-cargo-registry-

- name: Cache sccache output
uses: actions/cache@v2
continue-on-error: true
with:
path: ${{ github.workspace }}/.sccache
key: ${{ runner.os }}-${{ github.job }}-sccache-${{ hashFiles('**/Cargo.*') }}
restore-keys: ${{ runner.os }}-${{ github.job }}-sccache-

- name: Start sccache
run: sccache --start-server

- name: Run cargo udeps
run: cargo udeps --workspace --all-targets

- name: Stop sccache
run: sccache --stop-server


test:
runs-on: ${{ matrix.os }}
strategy:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ jobs:
- uses: actions-rs/[email protected]
with:
crate: cargo-audit
use-tool-cache: true
# this job hangs when using cache
# use-tool-cache: true
version: latest

- uses: actions-rs/audit-check@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## s2n-quic
## s2n-quic ![ci](https://github.com/awslabs/s2n-quic/workflows/ci/badge.svg) ![dependencies](https://github.com/awslabs/s2n-quic/workflows/dependencies/badge.svg)

TODO: Fill this README out!

Expand Down
2 changes: 1 addition & 1 deletion common/compliance/cargo-compliance/src/report/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ impl Report {
.par_iter()
.map(|(source, report)| {
let id = crate::fnv(source);
let path = lcov_dir.join(format!("compliance.{}.info", id));
let path = lcov_dir.join(format!("compliance.{}.lcov", id));
let mut output = BufWriter::new(std::fs::File::create(&path)?);
lcov::report(report, &mut output)?;
Ok(())
Expand Down

0 comments on commit c472f60

Please sign in to comment.