Merge pull request #105 from ActivityWatch/dev/github-actions

Move from Travis to GitHub Actions

Author: ErikBjare

.github/workflows/build.yml

@@ -0,0 +1,93 @@
+name: Rust
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, windows-latest, macOS-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Rust nightly
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        override: true
+    - name: Cache cargo build
+      uses: actions/cache@v1
+      env:
+        cache-name: cargo-build-target
+      with:
+        path: target
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ env.cache-name }}-
+    - name: Build
+      run: cargo build --workspace --verbose
+    - name: Run tests
+      run: cargo test --workspace --verbose
+    - name: Run tests with coverage
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev binutils-dev
+        cargo install --force cargo-kcov;
+        cargo kcov --print-install-kcov-sh | sh;
+        cargo kcov --all --verbose;
+        bash <(curl -s https://codecov.io/bash);
+
+
+  build-android:
+    name: Build for Android
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Rust nightly
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        override: true
+    - name: Cache cargo build
+      uses: actions/cache@v1
+      env:
+        cache-name: cargo-build-target-android
+      with:
+        path: target
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ env.cache-name }}-
+    - name: Install NDK
+      run: |
+        ./install-ndk.sh
+    - name: Build
+      run: |
+        export ANDROID_NDK_HOME=`pwd`/NDK
+        ./compile-android.sh
+
+  lint:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Rust nightly
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        components: clippy, rustfmt
+        override: true
+    - name: Check formatting
+      if: always()
+      run: cargo fmt -- --check
+    - name: Run clippy  # Doesn't fail build
+      if: always()
+      run: cargo clippy

.travis.yml

@@ -2,41 +2,43 @@ aw-server-rust
 ==============
 
 [![Dependency Status](https://deps.rs/repo/github/activitywatch/aw-server-rust/status.svg)](https://deps.rs/repo/github/activitywatch/aw-server-rust)
-[![Build Status](https://travis-ci.org/ActivityWatch/aw-server-rust.svg?branch=master)](https://travis-ci.org/ActivityWatch/aw-server-rust)
-[![Coverage Status](https://codecov.io/gh/ActivityWatch/aw-server-rust/branch/master/graph/badge.svg)](https://codecov.io/gh/ActivityWatch/aw-server-rust)
+![Build Status](https://github.com/ActivityWatch/aw-server-rust/workflows/Rust/badge.svg)
 
-A reimplementation of aw-server in Rust
+[![Coverage Status](https://codecov.io/gh/ActivityWatch/aw-server-rust/branch/master/graph/badge.svg)](https://codecov.io/gh/ActivityWatch/aw-server-rust)
 
-Primary features missing:
-- None?
+A reimplementation of aw-server in Rust.
 
 Caveats:
-- Lots of TODO and FIXME comments
 
-Bugs:
-- Memory leak during Bucket import? (wtf rust?)
+ - Lots of TODO and FIXME comments
+
+Features missing compared to the Python implementation of aw-server:
 
-Features missing compared to aw-server python:
-- Swagger support
+ - API explorer (Swagger/OpenAPI)
 
 ### How to compile
 
-Install rust nightly with rustup
+Install rust nightly with `rustup`:
 
-``` rustup default nightly ```
+```
+rustup default nightly
+```
 
-Run cargo build to build
+Build with `cargo`:
 
-``` cargo build --release ```
+```
+cargo build --release 
+```
 
-### How to run
+Your built executable will be located in `./target/release/aw-server-rust`
 
-After compilation you will have an executable at target/release/aw-server-rust
 
-``` ./target/release/aw-server-rust ```
+### How to run
 
-If you want to quick-compile for debugging, run cargo run from the project root
+If you want to quick-compile for debugging, run cargo run from the project root:
 
-*NOTE:* this will start aw-server-rust on the testing port 5666 instead of port 5600
+```
+cargo run --bin aw-server
+```
 
-``` cargo run ```
+*NOTE:* This will start aw-server-rust in testing mode (on port 5666 instead of port 5600).

README.md

@@ -23,7 +23,7 @@ mod test {
             match client.get_info() {
                 Ok(_) => break,
                 Err(err) => {
-                    if i == timeout_s-1 {
+                    if i == timeout_s - 1 {
                         panic!(
                             "Timed out starting aw-server after {}s: {:?}",
                             timeout_s, err

aw-client-rust/tests/test.rs

@@ -24,9 +24,9 @@ impl Event {
 
 impl PartialEq for Event {
     fn eq(&self, other: &Event) -> bool {
-        !(self.timestamp != other.timestamp ||
-            self.duration != other.duration ||
-            self.data != other.data)
+        !(self.timestamp != other.timestamp
+            || self.duration != other.duration
+            || self.data != other.data)
     }
 }
 

aw-models/src/event.rs

@@ -19,10 +19,7 @@ pub enum TimeIntervalError {
 
 impl TimeInterval {
     pub fn new(start: DateTime<Utc>, end: DateTime<Utc>) -> TimeInterval {
-        TimeInterval {
-            start,
-            end,
-        }
+        TimeInterval { start, end }
     }
 
     pub fn new_from_string(period: &str) -> Result<TimeInterval, TimeIntervalError> {

aw-models/src/timeinterval.rs

@@ -429,8 +429,8 @@ mod qfunctions {
     ) -> Result<DataType, QueryError> {
         // typecheck
         validate::args_length(&args, 2)?;
-        let events : Vec<Event> = (&args[0]).try_into()?;
-        let filter_events : Vec<Event> = (&args[1]).try_into()?;
+        let events: Vec<Event> = (&args[0]).try_into()?;
+        let filter_events: Vec<Event> = (&args[1]).try_into()?;
 
         let mut filtered_events = aw_transform::filter_period_intersect(&events, &filter_events);
         let mut filtered_tagged_events = Vec::new();

aw-query/src/functions.rs

@@ -46,9 +46,7 @@ impl RuleTrait for RegexRule {
             .data
             .values()
             .filter(|val| val.is_string())
-            .any(|val| {
-                self.regex.is_match(val.as_str().unwrap())
-            })
+            .any(|val| self.regex.is_match(val.as_str().unwrap()))
     }
 }
 

aw-transform/src/classify.rs

@@ -4,7 +4,7 @@ set -e;
 
 if [ -z "$ANDROID_NDK_HOME" ]; then
     echo 'ANDROID_NDK_HOME not set, downloading NDK';
-    wget https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip -O android-ndk.zip;
+    wget --no-verbose -O android-ndk.zip https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip;
     unzip -q -d NDK android-ndk.zip;
     ls NDK;
     mv NDK/*/* NDK/;