Skip to content

Commit

Permalink
Merge pull request #350 from Marwes/fix_ci
Browse files Browse the repository at this point in the history
chore: Update CI to assume github actions
  • Loading branch information
Marwes committed Aug 8, 2022
2 parents 6de4b29 + 1166216 commit c4e7275
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/rust.yml
Expand Up @@ -32,5 +32,16 @@ jobs:
- name: Build
run: cargo build

- name: Check 1.40
if: ${{ matrix.rust == '1.40.0' }}
run: |
cargo "$@" check
cargo "$@" check --no-default-features
- name: Run tests
if: ${{ matrix.rust != '1.40.0' }}
run: ./ci.sh

- name: Check docs
if: ${{ matrix.rust == 'stable' }}
run: cargo doc
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 11 additions & 20 deletions ci.sh
@@ -1,27 +1,18 @@
#!/bin/bash -x
set -ex

if [[ "$TRAVIS_RUST_VERSION" == "1.40.0" ]]; then
cargo "$@" check
cargo "$@" check --no-default-features
else
cargo "$@" build
cargo "$@" test --all-features
cargo "$@" test --all-features --examples
cargo "$@" build
cargo "$@" test --all-features
cargo "$@" test --all-features --examples

cargo "$@" test --bench json --bench http -- --test
cargo "$@" check --bench mp4 --features mp4

cargo "$@" build --no-default-features --features alloc
cargo "$@" test --no-default-features --features alloc --examples
cargo "$@" test --bench json --bench http -- --test
cargo "$@" check --bench mp4 --features mp4

cargo "$@" build --no-default-features
cargo "$@" test --no-default-features --examples
cargo "$@" build --no-default-features --features alloc
cargo "$@" test --no-default-features --features alloc --examples

cargo "$@" check --no-default-features --features tokio-02
cargo "$@" check --no-default-features --features tokio-03
fi
cargo "$@" build --no-default-features
cargo "$@" test --no-default-features --examples

if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then
cargo doc
fi
cargo "$@" check --no-default-features --features tokio-02
cargo "$@" check --no-default-features --features tokio-03
1 change: 0 additions & 1 deletion src/parser/range.rs
Expand Up @@ -85,7 +85,6 @@ parser! {
/// assert!(parser.parse("!").is_err());
/// # }
/// ```
#[inline]
pub fn recognize[Input, P](parser: P)(Input) -> <Input as StreamOnce>::Range
where [
P: Parser<Input>,
Expand Down

0 comments on commit c4e7275

Please sign in to comment.