Skip to content

Commit

Permalink
Merge branch 'master' into sj/appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
lemmih committed Aug 10, 2023
2 parents 42612e9 + bb44f0b commit 1220aad
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
security_audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
64 changes: 21 additions & 43 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,63 +24,43 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
name: Setup rust toolchain
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
components: rustfmt, clippy

- uses: Swatinem/rust-cache@v2
name: Load dependencies from cache

- uses: actions-rs/cargo@v1
name: Build with stable features
with:
command: build
args: --features stable
- name: Build with stable features
run: cargo build --features stable

- uses: actions-rs/cargo@v1
- name: Build with unstable features
if: ${{ matrix.rust == 'nightly' }}
name: Build with unstable features
with:
command: build
args: --all-features
run: cargo build --all-features

- uses: actions-rs/cargo@v1
name: Build with minimal features
with:
command: build
args: --no-default-features
- name: Build with minimal features
run: cargo build --no-default-features

- uses: actions-rs/cargo@v1
name: Test with stable features
with:
command: test
args: --features stable
- name: Test with stable features
run: cargo test --features stable

- uses: actions-rs/cargo@v1
name: Test with minimal features
with:
command: test
args: --no-default-features
- name: Test with minimal features
run: cargo test --no-default-features

- uses: actions-rs/cargo@v1
name: Check for non-standard formatting
- name: Check for non-standard formatting
if: ${{ matrix.rust == 'stable' }}
with:
command: fmt
args: --all -- --check
run: cargo fmt --all -- --check

- uses: actions-rs/cargo@v1
name: Check for clippy hints
- name: Check for clippy hints
if: ${{ matrix.rust == 'stable' }}
with:
command: clippy
args: -- -D warnings
run: cargo clippy -- -D warnings

# This fails on 1.64, but works on 1.66 and later.
# https://github.com/rust-lang/rust/issues/103306
- name: Test run targeting WASI
if: ${{ matrix.rust == 'stable' }}
run: |
curl https://wasmtime.dev/install.sh -sSf | bash
source ~/.bashrc
Expand All @@ -97,16 +77,14 @@ jobs:
- stable

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
components: rustfmt, clippy

- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2

- uses: taiki-e/install-action@nextest

Expand Down
1 change: 0 additions & 1 deletion plot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ num-complex = { version = "0.4", default-features = false, features = ["std"] }
rand = "0.8"

[badges]
travis-ci = { repository = "bheisler/criterion.rs" }
maintenance = { status = "looking-for-maintainer" }

0 comments on commit 1220aad

Please sign in to comment.