Skip to content

Commit

Permalink
Re-work CI around workspace
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Rosenberg <[email protected]>
  • Loading branch information
pinkforest and rozbb committed Jun 28, 2023
1 parent 6e422d9 commit 7db9981
Show file tree
Hide file tree
Showing 6 changed files with 190 additions and 318 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/cross.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Cross

on:
push:
branches: [ '**' ]
pull_request:
branches: [ '**' ]

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: '-D warnings'

jobs:

test-cross:
name: Test
strategy:
matrix:
include:
# ARM32
- target: armv7-unknown-linux-gnueabihf
rust: stable

# ARM64
- target: aarch64-unknown-linux-gnu
rust: stable

# PPC32
- target: powerpc-unknown-linux-gnu
rust: stable

# TODO: We only test x/ed/curve for cross as derive is platform specifics
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: ${{ matrix.deps }}
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
targets: ${{ matrix.target }}
- uses: RustCrypto/actions/cross-install@master
- run: cross test -p curve25519-dalek --release --target ${{ matrix.target }}
- run: cross test -p ed25519-dalek --release --target ${{ matrix.target }}
- run: cross test -p x25519-dalek --release --target ${{ matrix.target }}
131 changes: 9 additions & 122 deletions .github/workflows/curve25519-dalek.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,25 @@
name: Rust
name: curve25519 Rust

on:
push:
branches: [ '**' ]
paths: 'curve25519-dalek/**'
pull_request:
branches: [ '**' ]
paths: 'curve25519-dalek/**'

defaults:
run:
working-directory: curve25519-dalek

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: '-D warnings'

jobs:
test-auto:
runs-on: ubuntu-latest
strategy:
matrix:
include:
# 32-bit target
- target: i686-unknown-linux-gnu
deps: sudo apt update && sudo apt install gcc-multilib

# 64-bit target
- target: x86_64-unknown-linux-gnu
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: rustup target add ${{ matrix.target }}
- run: ${{ matrix.deps }}
- run: cargo test --target ${{ matrix.target }} --no-default-features
- run: cargo test --target ${{ matrix.target }} --no-default-features --features alloc
- run: cargo test --target ${{ matrix.target }} --no-default-features --features digest
- run: cargo test --target ${{ matrix.target }} --no-default-features --features precomputed-tables
- run: cargo test --target ${{ matrix.target }} --no-default-features --features rand_core
- run: cargo test --target ${{ matrix.target }} --no-default-features --features serde
- run: cargo test --target ${{ matrix.target }} --no-default-features --features zeroize
- run: cargo test --target ${{ matrix.target }}
- run: cargo test --target ${{ matrix.target }} --features digest
- run: cargo test --target ${{ matrix.target }} --features rand_core
- run: cargo test --target ${{ matrix.target }} --features serde

test-fiat:
name: Test fiat backend
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -60,6 +40,7 @@ jobs:
run: cargo test --target ${{ matrix.target }}

test-serial:
name: Test serial backend
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -90,19 +71,6 @@ jobs:
targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu,i686-unknown-linux-gnu
- run: bash tests/build_tests.sh

build-nostd:
name: Build on no_std target (thumbv7em-none-eabi)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: thumbv7em-none-eabi
- run: cargo build --target thumbv7em-none-eabi --release --no-default-features
- run: cargo build --target thumbv7em-none-eabi --release
- run: cargo build --target thumbv7em-none-eabi --release --features serde

test-simd-nightly:
name: Test simd backend (nightly)
runs-on: ubuntu-latest
Expand Down Expand Up @@ -132,70 +100,6 @@ jobs:
RUSTFLAGS: '-C target_feature=+avx2'
run: cargo test --no-default-features --features alloc,precomputed-tables,zeroize --target x86_64-unknown-linux-gnu

build-docs:
name: Build docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@nightly
- run: make doc
- run: make doc-internal

cross:
strategy:
matrix:
include:
# ARM32
- target: armv7-unknown-linux-gnueabihf
rust: stable

# ARM64
- target: aarch64-unknown-linux-gnu
rust: stable

# PPC32
- target: powerpc-unknown-linux-gnu
rust: stable

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: ${{ matrix.deps }}
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
targets: ${{ matrix.target }}
- uses: RustCrypto/actions/cross-install@master
- run: cross test --release --target ${{ matrix.target }}

nightly:
name: Test nightly compiler
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@nightly
- run: cargo test

clippy:
name: Check that clippy is happy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@nightly
with:
components: clippy
- run: cargo clippy --target x86_64-unknown-linux-gnu

rustfmt:
name: Check formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- run: cargo fmt --all -- --check

msrv:
name: Current MSRV is 1.60.0
runs-on: ubuntu-latest
Expand All @@ -211,20 +115,3 @@ jobs:
- run: cargo build --no-default-features --features serde
# Also make sure the AVX2 build works
- run: cargo build --target x86_64-unknown-linux-gnu

bench:
name: Check that benchmarks compile
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- name: Build u32 bench
env:
RUSTFLAGS: '--cfg curve25519_dalek_bits="32"'
run: cargo build --benches
- name: Build u64 bench
env:
RUSTFLAGS: '--cfg curve25519_dalek_bits="64"'
run: cargo build --benches
- name: Build default (host native) bench
run: cargo build --benches
100 changes: 7 additions & 93 deletions .github/workflows/ed25519-dalek.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,23 @@
name: Rust
name: ed25519 Rust

on:
push:
branches: [ '**' ]
paths: 'ed25519-dalek/**'
pull_request:
branches: [ '**' ]
paths: 'ed25519-dalek/**'

defaults:
run:
working-directory: ed25519-dalek

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: '-D warnings'
RUSTDOCFLAGS: '-D warnings'

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
include:
# 32-bit target
- target: i686-unknown-linux-gnu
deps: sudo apt update && sudo apt install gcc-multilib
# 64-bit target
- target: x86_64-unknown-linux-gnu
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: rustup target add ${{ matrix.target }}
- run: ${{ matrix.deps }}
- run: cargo test --target ${{ matrix.target }} --no-default-features --lib --tests
- run: cargo test --target ${{ matrix.target }} --no-default-features --features alloc --lib
- run: cargo test --target ${{ matrix.target }} --no-default-features --features fast --lib
- run: cargo test --target ${{ matrix.target }} --no-default-features --features rand_core --lib --tests
- run: cargo test --target ${{ matrix.target }} --no-default-features --features alloc,rand_core --lib --tests
- run: cargo test --target ${{ matrix.target }} --no-default-features --features fast,rand_core --lib --tests
- run: cargo test --target ${{ matrix.target }} --no-default-features --features alloc,fast,rand_core --lib --tests
- run: cargo test --target ${{ matrix.target }}
- run: cargo test --target ${{ matrix.target }} --features batch
- run: cargo test --target ${{ matrix.target }} --features digest,rand_core
- run: cargo test --target ${{ matrix.target }} --features serde
- run: cargo test --target ${{ matrix.target }} --features pem
- run: cargo test --target ${{ matrix.target }} --all-features

build-simd:
name: Test simd backend (nightly)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@nightly
- env:
RUSTFLAGS: '--cfg curve25519_dalek_backend="simd" -C target_feature=+avx2'
run: cargo build --target x86_64-unknown-linux-gnu
- env:
RUSTFLAGS: '--cfg curve25519_dalek_backend="simd" -C target_feature=+avx512ifma'
run: cargo build --target x86_64-unknown-linux-gnu

msrv:
name: Current MSRV is 1.60.0
Expand All @@ -69,54 +34,3 @@ jobs:
# deps and the stated MSRV
- uses: dtolnay/[email protected]
- run: cargo build

build-nostd:
name: Build on no_std target (thumbv7em-none-eabi)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: thumbv7em-none-eabi
- uses: taiki-e/install-action@cargo-hack
# No default features build
- run: cargo build --target thumbv7em-none-eabi --release --no-default-features
- run: cargo hack build --target thumbv7em-none-eabi --release --each-feature --exclude-features default,std

bench:
name: Check that benchmarks compile
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: cargo build --benches --features batch

rustfmt:
name: Check formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- run: cargo fmt --all -- --check

clippy:
name: Check that clippy is happy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/[email protected]
with:
components: clippy
- run: cargo clippy

doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- run: cargo doc --all-features
35 changes: 35 additions & 0 deletions .github/workflows/no_std.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: no_std

on:
push:
branches: [ '**' ]
pull_request:
branches: [ '**' ]

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: '-D warnings'

jobs:

build-nostd:
name: Build on no_std target (thumbv7em-none-eabi)
runs-on: ubuntu-latest
strategy:
matrix:
include:
- crate: curve25519-dalek
- crate: ed25519-dalek
- crate: x25519-dalek
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: thumbv7em-none-eabi
- uses: taiki-e/install-action@cargo-hack
# No default features build
- name: no_std / no feat ${{ matrix.crate }}
run: cargo build -p ${{ matrix.crate }} --target thumbv7em-none-eabi --release --no-default-features
- name: no_std / cargo hack ${{ matrix.crate }}
run: cargo hack build -p ${{ matrix.crate }} --target thumbv7em-none-eabi --release --each-feature --exclude-features default,std,getrandom
Loading

0 comments on commit 7db9981

Please sign in to comment.