Skip to content

Commit

Permalink
Merge branch 'main' into keks/more-hacl-rs
Browse files Browse the repository at this point in the history
  • Loading branch information
keks authored Dec 19, 2024
2 parents d7b13da + 50cacf4 commit 02eccae
Show file tree
Hide file tree
Showing 474 changed files with 72,241 additions and 28,962 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ecdh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
if: ${{ matrix.bits == 64 }}

- name: πŸ› οΈ Setup Rust Nightly
run: rustup toolchain install nightly
run: rustup toolchain install nightly-2024-12-14

- name: πŸ› οΈ Setup Ubuntu x86
if: ${{ matrix.bits == 32 && matrix.os == 'ubuntu-latest' }}
Expand Down Expand Up @@ -82,9 +82,10 @@ jobs:
- name: πŸ”¨ Build Release
run: cargo build --verbose --release $RUST_TARGET_FLAG

# TODO: https://github.com/cryspen/libcrux/issues/717
- name: πŸƒπŸ» Asan MacOS
if: ${{ matrix.os == 'macos-latest' }}
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly-2024-12-14 test --release --target aarch64-apple-darwin

# - name: ⬆ Upload build
# uses: ./.github/actions/upload_artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flake-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- uses: DeterminateSystems/nix-installer-action@v13
- uses: DeterminateSystems/nix-installer-action@v16
- name: update `flake.lock`
run: nix flake update
- name: commit
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/kem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
if: ${{ matrix.bits == 64 }}

- name: πŸ› οΈ Setup Rust Nightly
run: rustup toolchain install nightly
run: rustup toolchain install nightly-2024-12-14

- name: πŸ› οΈ Setup Ubuntu x86
if: ${{ matrix.bits == 32 && matrix.os == 'ubuntu-latest' }}
Expand Down Expand Up @@ -82,9 +82,10 @@ jobs:
- name: πŸ”¨ Build Release
run: cargo build --verbose --release $RUST_TARGET_FLAG

# TODO: https://github.com/cryspen/libcrux/issues/717
- name: πŸƒπŸ» Asan MacOS
if: ${{ matrix.os == 'macos-latest' }}
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly-2024-12-14 test --release --target aarch64-apple-darwin

# - name: ⬆ Upload build
# uses: ./.github/actions/upload_artifacts
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/mlkem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ jobs:
- name: πŸ”¨ Build
run: |
rustc --print=cfg
cargo build --verbose $RUST_TARGET_FLAG --features pre-verification
cargo build --verbose $RUST_TARGET_FLAG
- name: πŸ”¨ Build Release
run: cargo build --verbose --release $RUST_TARGET_FLAG --features pre-verification
run: cargo build --verbose --release $RUST_TARGET_FLAG

- name: πŸƒπŸ» Asan MacOS
if: ${{ matrix.os == 'macos-latest' }}
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin --features pre-verification
run: RUSTDOCFLAGS=-Zsanitizer=address RUSTFLAGS=-Zsanitizer=address cargo +nightly test --release --target aarch64-apple-darwin

# - name: ⬆ Upload build
# uses: ./.github/actions/upload_artifacts
Expand Down Expand Up @@ -135,27 +135,27 @@ jobs:
- name: πŸƒπŸ»β€β™€οΈ Test
run: |
cargo clean
cargo test --verbose $RUST_TARGET_FLAG --features pre-verification
cargo test --verbose $RUST_TARGET_FLAG
- name: πŸƒπŸ»β€β™€οΈ Test Release
run: |
cargo clean
cargo test --verbose --release $RUST_TARGET_FLAG --features pre-verification
cargo test --verbose --release $RUST_TARGET_FLAG
- name: πŸƒπŸ»β€β™€οΈ Test Portable
run: |
cargo clean
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose $RUST_TARGET_FLAG --features pre-verification
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose $RUST_TARGET_FLAG
- name: πŸƒπŸ»β€β™€οΈ Test Portable Release
run: |
cargo clean
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_FLAG --features pre-verification
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_FLAG
- name: πŸƒπŸ»β€β™€οΈ Test Kyber
run: |
cargo clean
cargo test --features pre-verification,kyber --verbose $RUST_TARGET_FLAG
cargo test ,kyber --verbose $RUST_TARGET_FLAG
- name: πŸƒπŸ»β€β™€οΈ Cargo Check Features
if: ${{ matrix.bits == 64 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
nix:
runs-on: ubuntu-latest
steps:
- uses: DeterminateSystems/nix-installer-action@v13
- uses: DeterminateSystems/nix-installer-action@v16
- uses: DeterminateSystems/magic-nix-cache-action@v7
- name: Install & configure Cachix
shell: bash
Expand Down
Loading

0 comments on commit 02eccae

Please sign in to comment.