Do not take into account a windows host build for overall CI status (#388)

master
Oleksandr Anyshchenko 5 years ago committed by GitHub
parent 3b9df2dd05
commit 5abcfe801a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      .travis.yml
  2. 9
      librocksdb-sys/build.rs

@ -1,6 +1,5 @@
language: rust language: rust
dist: xenial dist: bionic
sudo: false
os: os:
- linux - linux
@ -10,18 +9,9 @@ os:
rust: rust:
- stable - stable
addons: jobs:
apt: allow_failures:
sources: - os: windows
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty
packages:
- g++
- llvm-dev
- libclang-dev
- clang
cache: cargo
install: install:
- rustup component add rustfmt - rustup component add rustfmt

@ -81,7 +81,7 @@ fn build_rocksdb() {
let mut lib_sources = include_str!("rocksdb_lib_sources.txt") let mut lib_sources = include_str!("rocksdb_lib_sources.txt")
.trim() .trim()
.split("\n") .split('\n')
.map(str::trim) .map(str::trim)
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
@ -205,12 +205,11 @@ fn build_lz4() {
compiler.opt_level(3); compiler.opt_level(3);
match env::var("TARGET").unwrap().as_str() { let target = env::var("TARGET").unwrap();
"i686-pc-windows-gnu" => {
if &target == "i686-pc-windows-gnu" {
compiler.flag("-fno-tree-vectorize"); compiler.flag("-fno-tree-vectorize");
} }
_ => {}
}
compiler.compile("liblz4.a"); compiler.compile("liblz4.a");
} }

Loading…
Cancel
Save