diff options
| -rw-r--r-- | .github/workflows/rust.yml | 46 | ||||
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | dhall/build.rs | 7 |
3 files changed, 51 insertions, 23 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml new file mode 100644 index 0000000..1182441 --- /dev/null +++ b/.github/workflows/rust.yml @@ -0,0 +1,46 @@ +name: Test suite + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +# For inspiration, see https://github.com/nvzqz/static-assertions-rs/blob/a867e97a1b3c2e0c76b7a154abdf4e422b78e5f2/.github/workflows/CI.yml +jobs: + fmt: + name: Ensure code is formatted + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + components: rustfmt + - uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + + test: + name: Run test suite + runs-on: ubuntu-latest + steps: + - name: Checkout branch + uses: actions/checkout@master + with: + submodules: true + - name: Setup Rust toolchain + uses: actions-rs/toolchain@v1 + # - name: Run test suite + # uses: actions-rs/cargo@v1 + # with: + # command: test + # args: --release + - name: Run tests and gather coverage data + uses: actions-rs/tarpaulin@v0.1 + with: + args: '--release --all --exclude-files abnf_to_pest/* --exclude-files dhall_proc_macros/*' + - name: Upload coverage data to codecov.io + uses: codecov/codecov-action@v1.0.2 + with: + token: ${{secrets.CODECOV_TOKEN}} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bdd8b65..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: rust -sudo: required -dist: trusty -addons: - apt: - packages: - - libssl-dev -cache: cargo -rust: - - nightly-2019-03-15 - -install: -- cargo build --release --all --all-features -- cargo tarpaulin --version || RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin - -script: -- cargo tarpaulin -v --release --all-features --all --exclude-files dhall_generator/* --exclude-files abnf_to_pest/* --out Xml - -after_success: | - bash <(curl -s https://codecov.io/bash) - diff --git a/dhall/build.rs b/dhall/build.rs index ce677e3..366f8a4 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -411,7 +411,9 @@ fn convert_abnf_to_pest() -> std::io::Result<()> { // Setup grammar for precedence climbing rules.remove("operator_expression"); - writeln!(&mut file, r##" + writeln!( + &mut file, + r##" import_alt = {{ "?" ~ whsp1 }} bool_or = {{ "||" }} natural_plus = {{ "+" ~ whsp1 }} @@ -438,7 +440,8 @@ fn convert_abnf_to_pest() -> std::io::Result<()> { import_alt }} operator_expression = {{ with_expression ~ (whsp ~ operator ~ whsp ~ with_expression)* }} - "##)?; + "## + )?; writeln!( &mut file, |