diff --git a/.gitignore b/.gitignore index bf35d73..284c7da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +backend/target /target **/*.rs.bk lib/**/target diff --git a/.travis.yml b/.travis.yml index a1d3c41..feeb6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,12 @@ language: rust rust: - stable script: + - cd backend - cargo test -- --test-threads 1 - cargo build --release --verbose + - cd .. before_deploy: - - tar cvf albion-stats.tar --exclude='gui/src/__pycache__' gui/albion-stats gui/src target/release/libmeter.so + - tar cvf albion-stats.tar --exclude='gui/src/__pycache__' frontend backend/target/release/liblibaostats.so deploy: provider: releases api_key: diff --git a/README.md b/README.md index 3331371..46b4578 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@

-Project Badge + +Linux and OS X Build Status: [![Linux and OS X Build Status](https://api.travis-ci.org/mazurwiktor/albion-online-stats.svg)](https://travis-ci.org/mazurwiktor/albion-online-stats) + +Windows Build Status: [![Windows Build Status](https://ci.appveyor.com/api/projects/status/jx445p7q0eow95sk/branch/master?svg=true)](https://ci.appveyor.com/project/mazurwiktor/albion-online-stats) Albion Online Stats =================== diff --git a/backend/Cargo.lock b/backend/Cargo.lock index bdd37d2..2de89da 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -16,22 +16,6 @@ dependencies = [ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "aostats" -version = "0.1.0" -dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cpython 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fake_clock 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "packet_sniffer 0.1.0", - "photon_protocol 0.1.0", - "simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "arrayref" version = "0.3.5" @@ -308,6 +292,22 @@ name = "lazy_static" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libaostats" +version = "0.1.0" +dependencies = [ + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cpython 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fake_clock 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "packet_sniffer 0.1.0", + "photon_protocol 0.1.0", + "simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "libc" version = "0.2.61"