Skip to content

Commit

Permalink
Fix CI for a yanked crate version
Browse files Browse the repository at this point in the history
The locked version of ahash was yanked. This updates ahash to a newer
version.
  • Loading branch information
nick-mobilecoin committed Dec 4, 2023
1 parent 62f6a52 commit 20ae7a6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 37 deletions.
7 changes: 7 additions & 0 deletions .cargo/audit.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[advisories]
# RUSTSEC-2021-0127 - is for serde-cbor which is unmaintained
# at this time there still isn't a good alternative.
# `serde-cbor` is what the main MobileCoin repo uses into and out of the
# enclaves, we only use it for testing in this repo to ensure it works as
# expected.
ignore = ["RUSTSEC-2021-0127"]
11 changes: 2 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: r7kamura/rust-problem-matchers@v1
- run: cargo fmt --all -- --check
- uses: xt0rted/markdownlint-problem-matcher@v2
- uses: DavidAnson/markdownlint-cli2-action@v13
- uses: DavidAnson/markdownlint-cli2-action@v14
with:
globs: "**/*.md"

Expand Down Expand Up @@ -70,19 +70,12 @@ jobs:
- uses: mobilecoinfoundation/actions/dcap-libs@main
with:
version: 1.18.100.1-jammy1
- id: suppression
run: |
if [ "${{ matrix.rust }}" == "stable" ]; then
echo "suppression=-Aclippy::incorrect_clone_impl_on_copy_type" >> "$GITHUB_OUTPUT"
elif [ "${{ matrix.rust }}" == "beta" ]; then
echo "suppression=-Aclippy::non_canonical_clone_impl" >> "$GITHUB_OUTPUT"
fi
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
components: clippy
- uses: r7kamura/rust-problem-matchers@v1
- run: cargo +${{ matrix.rust }} clippy --all --all-features -- -D warnings ${{ steps.suppression.outputs.suppression }}
- run: cargo +${{ matrix.rust }} clippy --all --all-features -- -D warnings -Aclippy::non_canonical_clone_impl

build:
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint-cli2.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Disable some built-in rules
"config": {
"line-length": false,
"no-duplicate-header": {
"no-duplicate-heading": {
// Allow multiple "Added" sections in the changelog
"siblings_only": true
}
Expand Down
30 changes: 3 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 20ae7a6

Please sign in to comment.