diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11f7db6c13..060cd9b169 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,8 +89,6 @@ jobs: udeps: runs-on: ubuntu-latest - env: - RUSTC_WRAPPER: sccache steps: - uses: actions-rs/toolchain@v1 with: @@ -106,42 +104,9 @@ jobs: - uses: actions/checkout@v2 - - name: Install sccache - uses: actions-rs/install@v0.1 - 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: diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 5d2ae7141a..270198b65b 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -28,7 +28,8 @@ jobs: - uses: actions-rs/install@v0.1 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 diff --git a/README.md b/README.md index f853879299..36ae0d42af 100644 --- a/README.md +++ b/README.md @@ -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! diff --git a/common/compliance/cargo-compliance/src/report/mod.rs b/common/compliance/cargo-compliance/src/report/mod.rs index 5af5903090..754b323b0e 100644 --- a/common/compliance/cargo-compliance/src/report/mod.rs +++ b/common/compliance/cargo-compliance/src/report/mod.rs @@ -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(())