Merge branch 'master' of https://github.com/akvo/akvo-flow

akvo · Apr 24, 2018 · 57fa133 · 57fa133
2 parents f61d833 + 71f2db7
commit 57fa133
Show file tree

Hide file tree

Showing 86 changed files with 2,475 additions and 2,148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.class
 *.rpc
 *.swp
+*.p12
 
 # Eclipse files
 .classpath
@@ -37,7 +38,7 @@ GAE/bin
 GAE/build
 
 GAE/src/services/DataIssues.java
-
+GAE/target
 GAE/war/admin
 GAE/war/com.*
 GAE/war/exporterapplet.jar

diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,19 @@ cache:
   directories:
     - $HOME/.m2
     - $HOME/.cache
+    - $HOME/google-cloud-sdk
 
 before_install:
-  - docker pull akvo/flow-build
+  - docker pull akvo/flow-maven-build
+  - if [[ ! -f "$HOME/google-cloud-sdk/bin/gcloud" ]]; then rm -rf "$HOME/google-cloud-sdk";
+    curl https://sdk.cloud.google.com | bash > /dev/null; fi
+  - pip install pyopenssl
 
 script:
-  - ./docker/bootstrap-build.sh
+  - "./ci/bootstrap-build.sh /app/src/ci/build.sh && ./ci/deploy.sh"
+
+env:
+  global:
+  - PATH=$HOME/google-cloud-sdk/bin:$PATH
+  - CLOUDSDK_CORE_DISABLE_PROMPTS=1
+  - CLOUDSDK_PYTHON_SITEPACKAGES=1