Skip to content

Commit

Permalink
Merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
akoshelev committed Jan 14, 2025
2 parents 3b2edd5 + afb5e48 commit 68ebfbb
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 10 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: cargo audit
run: |
cargo audit
- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain

- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-audit

- uses: rustsec/audit-check@v1.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
17 changes: 11 additions & 6 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
- uses: ./.github/actions/rm

- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain
with:
components: clippy,rustfmt

Expand All @@ -46,7 +47,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}

- name: Check formatting
run: cargo fmt --all -- --check --config "imports_granularity=Crate,group_imports=StdExternalCrate"
Expand Down Expand Up @@ -86,6 +87,7 @@ jobs:
- uses: ./.github/actions/rm

- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain
with:
components: clippy,rustfmt

Expand All @@ -97,7 +99,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}

- name: Release Build
run: cargo build --release
Expand All @@ -120,6 +122,7 @@ jobs:
- uses: ./.github/actions/rm

- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain
with:
components: clippy,rustfmt

Expand All @@ -131,7 +134,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}

- name: Build benchmarks
run: cargo build --benches --no-default-features --features "enable-benches compact-gate"
Expand Down Expand Up @@ -162,6 +165,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/rm
- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain
- uses: actions/cache@v4
with:
path: |
Expand All @@ -170,7 +174,7 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}

- name: Slow Unit Tests
run: cargo test -p ipa-core --lib -- mpc_proptest semi_honest_with_dp_slow gen_binomial_noise_16_breakdowns
Expand All @@ -187,9 +191,10 @@ jobs:
- name: Integration Tests - IPA with Relaxed DP
run: cargo test --release --test "ipa_with_relaxed_dp" --no-default-features --features "cli web-app real-world-infra test-fixture compact-gate relaxed-dp"

# sanitizers currently require nightly https://github.com/rust-lang/rust/issues/39699
# sanitizers currently require nightly https://github.com/rust-lang/rust/issues/39699,
# and are broken on ubuntu 24.04 https://github.com/rust-lang/rust/issues/111073#issuecomment-2561607617
sanitize:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion ipa-core/src/protocol/hybrid/breakdown_reveal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ mod proptests {
} = input_struct;
let config = TestWorldConfig {
seed,
timeout: Some(Duration::from_secs(30)),
timeout: Some(Duration::from_secs(60)),
..Default::default()
};
let result = TestWorld::<WithShards<PROP_SHARDS>>::with_config(&config)
Expand Down
Empty file added ipa-core/src/report/ipa.rs
Empty file.

0 comments on commit 68ebfbb

Please sign in to comment.