Skip to content

Commit

Permalink
Merge branch 'main' into karthik/unpacked-api
Browse files Browse the repository at this point in the history
  • Loading branch information
jschneider-bensch authored Jul 10, 2024
2 parents 86a5cba + 4a72136 commit a37474b
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 10 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,16 @@ jobs:
run: ./build/ml_kem_bench
if: ${{ matrix.os != 'windows-latest' && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}

mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,17 @@ jobs:

- name: 🧹 Cargo fmt
run: cargo fmt --all -- --check

mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [fmt]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/ecdh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,17 @@ jobs:
run: |
cargo clean
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_FLAG
mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/hax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,17 @@ jobs:
# HAX_HOME=${{ github.workspace }}/hax \
# PATH="${PATH}:${{ github.workspace }}/fstar/bin" \
# ./hax.py prove --admit
mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [hax]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
16 changes: 15 additions & 1 deletion .github/workflows/kem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,18 @@ jobs:
- name: 🏃🏻‍♀️ Test Portable Release
run: |
cargo clean
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_FLAG
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo test --verbose --release $RUST_TARGET_
mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/mldsa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,17 @@ jobs:
run: |
cargo clean
cargo test --verbose --release $RUST_TARGET_FLAG
mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/mlkem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,17 @@ jobs:
run: |
cargo clean
LIBCRUX_DISABLE_SIMD128=1 LIBCRUX_DISABLE_SIMD256=1 cargo bench --verbose $RUST_TARGET_FLAG
mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [benchmarks, build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,17 @@ jobs:
cachix use hax
- uses: actions/checkout@v4
- run: nix build -L .#ml-kem

mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [nix]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,17 @@ jobs:
- name: 🏃🏻‍♀️ Test Release Windows x86
if: ${{ matrix.bits == 32 && matrix.os == 'windows-latest' }}
run: cargo test --verbose --release --target i686-pc-windows-msvc -- --nocapture

mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [platform]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
14 changes: 5 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,8 @@ jobs:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [benchmarks, build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
needs: [benchmarks]
uses: cryspen/actions/.github/workflows/merge-queue-status.yml@jonas/merge-queue-status
with:
needs_json: "${{toJSON(needs)}}"

15 changes: 15 additions & 0 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ "main", "dev" ]
pull_request:
branches: [ "main", "dev" ]
merge_group:

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -51,3 +52,17 @@ jobs:
- name: Run tests
working-directory: specs
run: cargo test --verbose

mq_status:
if: |
always() &&
github.event_name == 'workflow_dispatch' || github.event_name == 'merge_group'
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Successful
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1

0 comments on commit a37474b

Please sign in to comment.