Skip to content

Commit

Permalink
Update travis config (#3)
Browse files Browse the repository at this point in the history
Update travis config and fix clippy warnings
  • Loading branch information
jackcmay authored Oct 30, 2018
1 parent b64499e commit 4d93288
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 25 deletions.
41 changes: 18 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
language: rust
rust:
- stable
- beta
- nightly
- stable
- beta
- nightly
os:
- linux
- osx
- linux
- osx
matrix:
allow_failures:
- rust: nightly

- rust: nightly
before_script:
- rustup update
- rustup component add clippy-preview

- rustup update
- rustup component add clippy-preview
script:
- cargo clippy
- cargo test

- cargo clippy -- --deny=warnings
- export RUSTFLAGS="-D warnings"; cargo build --verbose
- export RUSTFLAGS="-D warnings"; cargo test --verbose
before_deploy:
- cargo doc
- cargo package

- cargo doc
- cargo package
deploy:
provider: releases
api-key:
secure:
skip_cleanup: true
api_key:
secure: evX74a5Y+BTAV3lXYEPXqzON5UYKuTfKOUT11w4kzKYIErlwC08A4ws/1qHIz1XcpDiOel2/AKfYFQ5mXYsvpN4Bs8jKGFDAysHuvIgaYcI7I8JAmxrPbQxFnCkaqFjcYvNgMwBYvABq5Qv6STM1dcLtp8rNrDfU8iBuSdqzByeymtPWmsS5RFAxgOq6DhPhXdIcL4McmqDiTtDv8XrtHvC9WJgUttMSzRO7aqmc13MiTbcNnRi3PflNZXS1bnSAmfZziXirQdWA/orIGzfBiT7Gf+6doU7q0OWlNyBw8A/6F72qxUmVRmF2QVGW/VOWD4ZhR+40SAbpr3S+i39lC3BcZ7zT+eMNvinTwKd0KKe6Ge9STCM1A2ehwF9FmOnNWkSNYGo9tqMdn9ldYUVEkQr4pSDa1JCEMYUQxxn2100LcT+NfBoqqfFWcAQR10A//VECQGVO3GhsI1kQgVJee2ptiKvJT18L53uFhJ6LspWboP6QYsAy/DugLjmlB1Wn1Aaxc2+GGT2fohVl1c69QibQui/jhGOBK8GDKXg792vPpMW/GzT/CZd/dZdz7s4gG8aHi5BxfdO0+3zWckiOgtIeJxLMKB+xFSULbCBkL+yDj9Lh/6cEGqExsFT12nMi6u9IvFvYX+dX9OlOq6s53Q3tgqZxM0/D/mguwDNre+Q=
file: ''
on:
tags: true
repo: solana-labs/rbpf
branch: solana-master
condition: "$TRAVIS_RUST_VERSION = stable"

after_deploy:
- cargo publish --token "$CRATES_IO_TOKEN"
- cargo publish --token "$CRATES_IO_TOKEN"
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Allows old-style clippy
#![allow(renamed_and_removed_lints)]

#![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names, single_match, cast_lossless, doc_markdown, match_same_arms, unreadable_literal))]
#![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names, single_match, cast_lossless, doc_markdown, match_same_arms, unreadable_literal, new_ret_no_self))]

extern crate byteorder;
extern crate combine;
Expand Down
2 changes: 1 addition & 1 deletion tests/ubpf_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern crate solana_rbpf;

use solana_rbpf::assembler::assemble;
use solana_rbpf::ebpf;
use solana_rbpf::{EbpfVmRaw, EbpfVmNoData, EbpfVmMbuff, EbpfVmFixedMbuff};
use solana_rbpf::EbpfVmNoData;

#[test]
#[should_panic(expected = "[Verifier] Error: division by 0 (insn #1)")]
Expand Down

0 comments on commit 4d93288

Please sign in to comment.