Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI images and actions workflows #24

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Update CI images and actions workflows #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11bf7b0
Update CI images and actions workflows
randombit Aug 27, 2024
c91ccd5
Try to avoid slow crates.io update with 1.57.0
randombit Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,37 @@ on:
pull_request:
branches: [ master ]

env:
# https://github.com/rust-lang/cargo/issues/11014
CARGO_NET_GIT_FETCH_WITH_CLI: true

jobs:
rustfmt:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
components: rustfmt

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: cargo fmt -- --check
clippy:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
components: clippy

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: cargo +nightly clippy -- --deny warnings
ci:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
fail-fast: false
Expand All @@ -42,11 +46,15 @@ jobs:
- toolchain: stable
- toolchain: beta
- toolchain: nightly
- toolchain: 1.57.0 # MSRV
- toolchain: 1.57.0 # MSRV

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}
- run: cargo test
- run: cargo test --no-default-features
- run: cargo test --no-default-features --features=aead
- run: cargo test --no-default-features --features=ecdsa
- run: cargo test --no-default-features --features=rsa_sig
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
#![forbid(unsafe_code)]

use serde::{de::Error, Deserialize, Deserializer};
use std::collections::HashMap;
use std::fmt;

/// The error type
Expand Down Expand Up @@ -315,7 +314,7 @@ macro_rules! define_test_set {
pub number_of_tests: usize,
#[serde(deserialize_with = "combine_header")]
pub header: String,
pub notes: HashMap<TestFlag, TestFlagInfo>,
pub notes: std::collections::HashMap<TestFlag, TestFlagInfo>,
schema: TestSchema,
#[serde(rename = "testGroups")]
pub test_groups: Vec<TestGroup>,
Expand Down Expand Up @@ -555,6 +554,7 @@ impl LargeInteger {
}

mod test_keys;
#[allow(unused_imports)]
pub use test_keys::*;

#[cfg(feature = "aead")]
Expand Down
1 change: 1 addition & 0 deletions src/test_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use super::*;

#[allow(dead_code)]
fn int_from_base64<'de, D: Deserializer<'de>>(deserializer: D) -> Result<LargeInteger, D::Error> {
let s: &str = Deserialize::deserialize(deserializer)?;
let bytes = data_encoding::BASE64URL_NOPAD
Expand Down