From a15b8188276a5400c64e0decf33e1863ca471413 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 25 Jul 2017 09:50:40 +0200
Subject: [PATCH 1/4] Check Android build on travis

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9fe67531..11a59cea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,8 @@
+sudo: required
+
+services:
+  - docker
+  
 language: rust
 
 rust:
@@ -21,6 +26,7 @@ script:
   - cargo build --verbose
   - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
   - cargo test --verbose
+  - docker run --rm -v "$(pwd):/root/src" -w /root/src tomaka/cargo-apk cargo apk build --verbose
 
 os:
   - linux

From 772acc742e972a6a2c3e351f91d67d69a06f4346 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 25 Jul 2017 10:01:05 +0200
Subject: [PATCH 2/4] Build the window example for android

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 11a59cea..597c6699 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ script:
   - cargo build --verbose
   - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
   - cargo test --verbose
-  - docker run --rm -v "$(pwd):/root/src" -w /root/src tomaka/cargo-apk cargo apk build --verbose
+  - docker run --rm -v "$(pwd):/root/src" -w /root/src tomaka/cargo-apk cargo apk build --example window --verbose
 
 os:
   - linux

From 3ccee6c2f100dde0f17705f9771b9d74e3fb72f6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 25 Jul 2017 10:13:45 +0200
Subject: [PATCH 3/4] Use circle-ci for Android

---
 .circleci/config.yml | 23 +++++++++++++++++++++++
 .travis.yml          |  6 ------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..822ac89b
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2
+
+jobs:
+
+  test:
+    working_directory: ~/tgst
+    docker:
+      - image: tomaka/cargo-apk
+    steps:
+      - checkout
+      - restore_cache:
+          key: test-cache-{{ checksum "Cargo.lock" }}
+      - run: cargo apk build --example window
+      - save_cache:
+          key: test-cache-{{ checksum "Cargo.lock" }}
+          paths:
+            - target
+
+workflows:
+  version: 2
+  build-test-and-deploy:
+    jobs:
+      - test
diff --git a/.travis.yml b/.travis.yml
index 597c6699..9fe67531 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,3 @@
-sudo: required
-
-services:
-  - docker
-  
 language: rust
 
 rust:
@@ -26,7 +21,6 @@ script:
   - cargo build --verbose
   - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
   - cargo test --verbose
-  - docker run --rm -v "$(pwd):/root/src" -w /root/src tomaka/cargo-apk cargo apk build --example window --verbose
 
 os:
   - linux

From 8f04d6d4d0c8812b6d393d63d44ebcfcda472839 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 25 Jul 2017 10:16:46 +0200
Subject: [PATCH 4/4] Fix caching

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 822ac89b..5ac68236 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,10 +9,10 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: test-cache-{{ checksum "Cargo.lock" }}
+          key: test-cache-{{ checksum "Cargo.toml" }}
       - run: cargo apk build --example window
       - save_cache:
-          key: test-cache-{{ checksum "Cargo.lock" }}
+          key: test-cache-{{ checksum "Cargo.toml" }}
           paths:
             - target