diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2023-03-13 01:01:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 01:01:23 -0400 |
| commit | 4f1ac8255f8354832e07684e98e6c9d1cfdd33e2 (patch) | |
| tree | c304378e8e30d88f7d5a982614eb764d90b550ca | |
| parent | 7f4e7629213d55723616d2cbfc0699c942e07017 (diff) | |
ci: go back to using default cache key + target, update to 2.2.1 (#1058)
* ci: go back to using default cache key + target, update to 2.2.1
* fix formatting
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/coverage.yml | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7b9feb8..dbed14db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,10 +97,10 @@ jobs: target: ${{ matrix.info.target }} - name: Enable Rust cache - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # 2.2.0 + uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # 2.2.1 if: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }} # If it is a PR, only if not a fork with: - shared-key: build-cache-${{ matrix.info.target }} + key: ${{ matrix.info.target }} - name: Check cargo fmt run: cargo fmt --all -- --check @@ -241,10 +241,10 @@ jobs: target: ${{ matrix.info.target }} - name: Enable Rust cache - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # 2.2.0 + uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # 2.2.1 if: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }} # If it is a PR, only if not a fork with: - shared-key: build-cache-${{ matrix.info.target }} + key: ${{ matrix.info.target }} - name: Check uses: ClementTsang/cargo-action@v0.0.3 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 535c5a90..c5f7999e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -43,9 +43,9 @@ jobs: fail-fast: false matrix: info: - - { os: "ubuntu-latest" } - - { os: "macos-12" } - - { os: "windows-2019" } + - { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu" } + - { os: "macos-12", target: "x86_64-apple-darwin" } + - { os: "windows-2019", target: "x86_64-pc-windows-msvc" } steps: - name: Checkout repository uses: actions/checkout@v3 @@ -56,8 +56,10 @@ jobs: toolchain: stable - name: Enable Rust cache - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # 2.2.0 + uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # 2.2.1 if: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }} # If it is a PR, only if not a fork + with: + key: ${{ matrix.info.target }} - name: Install cargo-llvm-cov run: | @@ -66,7 +68,7 @@ jobs: - name: Generate code coverage run: | - cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info --locked + cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info --locked --target=${{ matrix.info.target }} - name: Upload to codecov.io uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 |